osg::Uniform::get does not return a value on error.

Fixes "usage of uninitialized data" errors reported by valgrind.
2012-03-26 21:00:10 +02:00
parent 94eabf6220
commit ac29faf3bb
1 changed files with 2 additions and 2 deletions
@@ -998,8 +998,8 @@ struct UniformBuilder :public PassAttributeBuilder
        // optimize common uniforms
        if (uniformType == Uniform::SAMPLER_2D || uniformType == Uniform::INT)
        {
-            int val;
-            uniform->get(val);
+            int val = 0;
+            uniform->get(val); // 'val' remains unchanged in case of error (Uniform is a non-scalar)
            if (uniformType == Uniform::SAMPLER_2D && val == 0
                && name == "texture") {
                uniform = texture0;