From Mike Weiblen, further work on GLSL support

2005-05-06 09:58:49 +00:00
parent fc585cd33d
commit 7480d51830
6 changed files with 36 additions and 21 deletions
--- a/src/osg/Uniform.cpp
+++ b/src/osg/Uniform.cpp
@@ -11,7 +11,7 @@
 */

 /* file:    src/osg/Uniform.cpp
- * author:    Mike Weiblen 2005-04-21
+ * author:    Mike Weiblen 2005-05-05
 */

 #include <osg/Notify>
@@ -34,8 +34,8 @@ Uniform::Uniform() :
 }


-Uniform::Uniform( const std::string& name, Type type ) :
-    _name(name), _type(type),_modifiedCount(0)
+Uniform::Uniform( Type type, const std::string& name ) :
+    _type(type), _name(name), _modifiedCount(0)
 {
    setDataVariance(STATIC);