From Marin Platings and Robert Osfield, fix of Uniform unique ID by making osg::Object::setName() virtual.

2010-11-26 13:54:11 +00:00
parent 4820157fed
commit ebfcb17744
3 changed files with 6 additions and 6 deletions
--- a/src/osg/Uniform.cpp
+++ b/src/osg/Uniform.cpp
@@ -88,8 +88,8 @@ void Uniform::setName( const std::string& name )
        OSG_WARN << "cannot change Uniform name" << std::endl;
        return;
    }
-    _name = name;
-    _nameID = getNameID(name);
+    Object::setName(name);
+    _nameID = getNameID(_name);
 }

 void Uniform::setNumElements( unsigned int numElements )