Miscellaneous fixes

diff --git a/source/animatedobject.cpp b/source/animatedobject.cpp
index 3a1d9d836ffea98989b79936f87a8ebe8034e20b..8b030978eecda6a6a10af0cb5dab83f121e1334f 100644 (file)
--- a/source/animatedobject.cpp
+++ b/source/animatedobject.cpp
@@ -37,7 +37,7 @@ void AnimatedObject::set_pose_matrix(unsigned link, const Matrix &m)
                if(link*16>=pose_data.size())
                        pose_data.resize((link+1)*16);
                copy(m.data(), m.data()+16, &pose_data[link*16]);
-               shdata->uniform_matrix4_array("pose[0]", pose_data.size()/16, &pose_data[0]);
+               shdata->uniform_matrix4_array("pose", pose_data.size()/16, &pose_data[0]);
        }
 }
 

diff --git a/source/bufferable.cpp b/source/bufferable.cpp
index 569ffb2f08a252cb1d153e591df420a1108dcf5a..e6b52ddfa53f622f1bdcbffe692dc337db92cb48 100644 (file)
--- a/source/bufferable.cpp
+++ b/source/bufferable.cpp
@@ -40,6 +40,7 @@ void Bufferable::use_buffer(Buffer *buf, Bufferable *prev)
                }
        }
 
+       dirty = true;
        update_offset();
 }
 

diff --git a/source/bufferable.h b/source/bufferable.h
index f157c6281d2197d17b56bd78a7d61cd1754ee186..a88f7b07a719535d426e262157fc8ef10879bd80 100644 (file)
--- a/source/bufferable.h
+++ b/source/bufferable.h
@@ -37,7 +37,6 @@ private:
 protected:
        mutable bool dirty;
 
-protected:
        Bufferable();
 public:
        virtual ~Bufferable();

diff --git a/source/postprocessor.cpp b/source/postprocessor.cpp
index 3c6fbebe89b5704b64a6fd1428a6259fc76f34bb..d4f7bd2ebd32d048db9e988a70323437c61e02af 100644 (file)
--- a/source/postprocessor.cpp
+++ b/source/postprocessor.cpp
@@ -34,7 +34,7 @@ const Mesh &PostProcessor::get_fullscreen_quad()
 
 const Mesh &PostProcessor::create_fullscreen_quad()
 {
-       static Mesh mesh(GL::VERTEX2);
+       static Mesh mesh(VERTEX2);
        MeshBuilder builder(mesh);
        builder.begin(TRIANGLE_STRIP);
        builder.vertex(-1, 1);