Merge branch 'master' of https://github.com/openscenegraph/OpenSceneGraph

2017-03-01 16:12:49 -06:00
parent 69b8d01de6 ad0e6a0f81
commit 7b3fc0925c
59 changed files with 1001 additions and 874 deletions
--- a/src/osgDB/SharedStateManager.cpp
+++ b/src/osgDB/SharedStateManager.cpp
@@ -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)
 {