FGFS-4.1/OpenSceneGraph
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Changed StateSet::ParentList from vector<Object*> to vector<Node*> to reflect that Drawable is now a Node.

Browse Source 
git-svn-id: http://svn.openscenegraph.org/osg/OpenSceneGraph/trunk@14420 16af8721-9629-0410-8352-f15c8da7e697
This commit is contained in:
Robert Osfield
2014-08-25 13:43:11 +00:00
parent beeda386ef
commit 6126379362
3 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/osg/StateSet.cpp
View File

@@ -273,7 +273,7 @@ void StateSet::computeDataVariance()
}
void StateSet::addParent(osg::Object* object)
void StateSet::addParent(osg::Node* object)
{
// OSG_DEBUG_FP<<"Adding parent"<<std::endl;
OpenThreads::ScopedPointerLock<OpenThreads::Mutex> lock(getRefMutex());
@@ -281,7 +281,7 @@ void StateSet::addParent(osg::Object* object)
_parents.push_back(object);
}
void StateSet::removeParent(osg::Object* object)
void StateSet::removeParent(osg::Node* object)
{
OpenThreads::ScopedPointerLock<OpenThreads::Mutex> lock(getRefMutex());