Show
Ignore:
Timestamp:
06/03/11 00:04:08 (4 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:
1 modified

Legend:

Unmodified
Added
Removed
  • OpenSceneGraph/trunk/src/osg/Node.cpp

    r10362 r12480  
    8282        _numChildrenWithCullingDisabled(0), // assume no children yet. 
    8383        _numChildrenWithOccluderNodes(0), 
    84         _nodeMask(node._nodeMask),  
    85         _descriptions(node._descriptions) 
     84        _nodeMask(node._nodeMask) 
    8685{ 
    8786    setStateSet(copyop(node._stateset.get())); 
     
    502501     
    503502    if (_stateset.valid()) _stateset->setThreadSafeRefUnref(threadSafe); 
    504  
    505503    if (_updateCallback.valid()) _updateCallback->setThreadSafeRefUnref(threadSafe); 
    506504    if (_eventCallback.valid()) _eventCallback->setThreadSafeRefUnref(threadSafe); 
    507505    if (_cullCallback.valid()) _cullCallback->setThreadSafeRefUnref(threadSafe); 
    508  
    509     if (_userData.valid()) _userData->setThreadSafeRefUnref(threadSafe); 
    510506} 
    511507