diff --git a/src/osg/State.cpp b/src/osg/State.cpp index 9ec306123..dd6972a20 100644 --- a/src/osg/State.cpp +++ b/src/osg/State.cpp @@ -591,11 +591,12 @@ void State::popAllStateSets() { while (!_stateStateStack.empty()) popStateSet(); } - +#if 0 applyProjectionMatrix(0); applyModelViewMatrix(0); _lastAppliedProgramObject = 0; +#endif } void State::popStateSet() @@ -1282,7 +1283,6 @@ bool State::checkGLErrors(const StateAttribute* attribute) const return false; } - void State::applyModelViewAndProjectionUniformsIfRequired() { if (!_lastAppliedProgramObject) return; @@ -1469,8 +1469,6 @@ void State::applyModelViewMatrix(const osg::Matrix& matrix) loadModelViewMatrix(); } -#include - void State::updateModelViewAndProjectionMatrixUniforms() { if (_modelViewProjectionMatrixUniform.valid()) _modelViewProjectionMatrixUniform->set((*_modelView) * (*_projection));