Moved the moveToRootStateGraph(,) from RenderStage::drawImplemenation() to RenderBin::drawImplementation();

2006-07-18 20:17:31 +00:00
parent 97dde14dcf
commit dfbc9d0441
3 changed files with 13 additions and 9 deletions
--- a/src/osgUtil/RenderBin.cpp
+++ b/src/osgUtil/RenderBin.cpp
@@ -417,7 +417,17 @@ void RenderBin::drawImplementation(osg::State& state,RenderLeaf*& previous)
        rbitr->second->draw(state,previous);
    }

-    if (_stateset.valid()) state.popStateSet();
+    // now reset the state so its back in its default state.
+    if (previous)
+    {
+        StateGraph::moveToRootStateGraph(state,previous->_parent);
+        previous = NULL;
+    }
+
+    if (_stateset.valid())
+    {
+        state.popStateSet();
+    }

    //osg::notify(osg::NOTICE)<<"end RenderBin::drawImplementation "<<className()<<std::endl;
 }