Changeset 13171

Show
Ignore:
Timestamp:
12/18/14 16:59:16 (less than one hour ago)
Author:
robert
Message:

From Mattias Helsing, "CMake have release 3.0 and 3.1 and we have some bad checks for cmake
major version when settings cmake policies in CMakeLists.txt. This fixes it"

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);