Changeset 12480 for OpenSceneGraph/trunk/src/osg/Node.cpp

Timestamp:

06/03/11 00:04:08 (2 years ago)

Author:

robert

Message:

Introduced new user object support into osg::Object that allows assignment of a list of user objects to an osg::Object.

Refactored original UserData? and Descriptions strings to be managed alongside the new user object suppport within
a single osg::Object::UserDataContainer?.

Files:

• OpenSceneGraph/trunk/src/osg/Node.cpp (modified) (2 diffs)

OpenSceneGraph/trunk/src/osg/Node.cpp

@@ -82 +82 @@
         _numChildrenWithCullingDisabled(0), // assume no children yet.
         _numChildrenWithOccluderNodes(0),
-        _nodeMask(node._nodeMask), 
-        _descriptions(node._descriptions)
+        _nodeMask(node._nodeMask)
 {
     setStateSet(copyop(node._stateset.get()));
@@ -502 +501 @@
     
     if (_stateset.valid()) _stateset->setThreadSafeRefUnref(threadSafe);
-
     if (_updateCallback.valid()) _updateCallback->setThreadSafeRefUnref(threadSafe);
     if (_eventCallback.valid()) _eventCallback->setThreadSafeRefUnref(threadSafe);
     if (_cullCallback.valid()) _cullCallback->setThreadSafeRefUnref(threadSafe);
-
-    if (_userData.valid()) _userData->setThreadSafeRefUnref(threadSafe);
 }