From 8af7b04c5b5715056b583a363bdb957d567d4aa3 Mon Sep 17 00:00:00 2001
From: Robert Osfield <robert@openscenegraph.com>
Date: Tue, 9 May 2006 09:47:26 +0000
Subject: [PATCH] From Farshid Lashkari, "The drawInner() method of
 osgUtil::RenderStage ignores the checkForGLErrors flag of the osg::State
 object. The attatched file fixes this."

---
 src/osgUtil/RenderStage.cpp | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/src/osgUtil/RenderStage.cpp b/src/osgUtil/RenderStage.cpp
index 1cdcecf34..5d7173de2 100644
--- a/src/osgUtil/RenderStage.cpp
+++ b/src/osgUtil/RenderStage.cpp
@@ -629,11 +629,14 @@ void RenderStage::drawInner(osg::State& state,RenderLeaf*& previous, bool& doCop
     RenderBin::draw(state,previous);
 
 
-    GLenum errorNo = glGetError();
-    if (errorNo!=GL_NO_ERROR)
+    if(state.getCheckForGLErrors()!=osg::State::NEVER_CHECK_GL_ERRORS)
     {
-        osg::notify(osg::NOTICE)<<"RenderStage::drawInner(,) OpenGL errorNo= 0x"<<std::hex<<errorNo<<std::endl;
-        if (fbo_ext) osg::notify(osg::NOTICE)<<"RenderStage::drawInner(,) FBO status= 0x"<<std::hex<<fbo_ext->glCheckFramebufferStatusEXT(GL_FRAMEBUFFER_EXT)<<std::endl;
+        GLenum errorNo = glGetError();
+        if (errorNo!=GL_NO_ERROR)
+        {
+            osg::notify(osg::NOTICE)<<"RenderStage::drawInner(,) OpenGL errorNo= 0x"<<std::hex<<errorNo<<std::endl;
+            if (fbo_ext) osg::notify(osg::NOTICE)<<"RenderStage::drawInner(,) FBO status= 0x"<<std::hex<<fbo_ext->glCheckFramebufferStatusEXT(GL_FRAMEBUFFER_EXT)<<std::endl;
+        }
     }
     // state.checkGLErrors("After RenderBin::draw");