Changeset 13171

Show
Ignore:
Timestamp:
11/26/14 21:40:57 (4 hours ago)
Author:
robert
Message:

From Jason Beverage, "It looks like the Callback header got accidentally removed from the CMakeLists.txt in the submission yesterday for the geometry instancing example."

Files:
1 modified

Legend:

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

    r13059 r13171  
    6060    OSG_DEBUG_FP<<"Uniform Adding parent"<<std::endl; 
    6161 
     62    OpenThreads::ScopedPointerLock<OpenThreads::Mutex> lock(getRefMutex()); 
     63 
    6264    _parents.push_back(object); 
    6365} 
     
    6567void Uniform::removeParent(osg::StateSet* object) 
    6668{ 
     69    OpenThreads::ScopedPointerLock<OpenThreads::Mutex> lock(getRefMutex()); 
     70 
    6771    ParentList::iterator pitr = std::find(_parents.begin(),_parents.end(),object); 
    6872    if (pitr!=_parents.end()) _parents.erase(pitr);