From 41a07127fe25a614809178b35eebc9ab66f0ade0 Mon Sep 17 00:00:00 2001 From: Robert Osfield Date: Wed, 10 Sep 2003 23:18:52 +0000 Subject: [PATCH] Added applyProjectionMatrix(0); & applyModelViewMatrix(0); into osg::State::popAllStateSets(), removed some debugging output. --- include/osg/CullStack | 2 +- src/osg/State.cpp | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/include/osg/CullStack b/include/osg/CullStack index 4cfd458b7..140373da1 100644 --- a/include/osg/CullStack +++ b/include/osg/CullStack @@ -291,7 +291,7 @@ inline RefMatrix* CullStack::createOrReuseMatrix(const osg::Matrix& value) while (_currentReuseMatrixIndex<_reuseMatrixList.size() && _reuseMatrixList[_currentReuseMatrixIndex]->referenceCount()>1) { - notify(osg::NOTICE)<<"Warning:createOrReuseMatrix() skipping multiply refrenced entry."<< std::endl; + //notify(osg::NOTICE)<<"Warning:createOrReuseMatrix() skipping multiply refrenced entry."<< std::endl; ++_currentReuseMatrixIndex; } diff --git a/src/osg/State.cpp b/src/osg/State.cpp index 8c6d16712..de135a12b 100644 --- a/src/osg/State.cpp +++ b/src/osg/State.cpp @@ -151,6 +151,9 @@ void State::pushStateSet(const StateSet* dstate) void State::popAllStateSets() { while (!_drawStateStack.empty()) popStateSet(); + + applyProjectionMatrix(0); + applyModelViewMatrix(0); } void State::popStateSet()