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/include/osgDB/SharedStateManager
+++ b/include/osgDB/SharedStateManager
@@ -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