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

Remove redundant handling of Geode in SharedStateManager

Browse Source
This commit is contained in:
scrawl
2017-02-03 17:34:17 +01:00
parent a13b66135f
commit 09ca132102
2 changed files with 0 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
include/osgDB/SharedStateManager
View File

@@ -61,7 +61,6 @@ namespace osgDB {
void share(osg::Node *node, OpenThreads::Mutex *mt=0);
void apply(osg::Node& node);
void apply(osg::Geode& geode);
// Answers the question "Will this state set be eliminated by
// the SharedStateManager because an equivalent one has been

14
src/osgDB/SharedStateManager.cpp
View File

@@ -93,20 +93,6 @@ void SharedStateManager::apply(osg::Node& node)
if(ss) process(ss, &node);
traverse(node);
}
void SharedStateManager::apply(osg::Geode& geode)
{
osg::StateSet* ss = geode.getStateSet();
if(ss) process(ss, &geode);
for(unsigned int i=0;i<geode.getNumDrawables();++i)
{
osg::Drawable* drawable = geode.getDrawable(i);
if(drawable)
{
ss = drawable->getStateSet();
if(ss) process(ss, drawable);
}
}
}
bool SharedStateManager::isShared(osg::StateSet* ss)
{