From 3bcfad833ce110caa036a2b13e41d8d7d523841f Mon Sep 17 00:00:00 2001 From: Robert Osfield Date: Wed, 17 Jun 2015 16:25:47 +0000 Subject: [PATCH] Fixed handling of use GLObjectsVisitor for modifying scene graph state without compiling to OpenGL so that the visitor can be run safely without a graphics context being current. git-svn-id: http://svn.openscenegraph.org/osg/OpenSceneGraph/trunk@14921 16af8721-9629-0410-8352-f15c8da7e697 --- src/osgUtil/GLObjectsVisitor.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/osgUtil/GLObjectsVisitor.cpp b/src/osgUtil/GLObjectsVisitor.cpp index 820d1a6be..dce01090e 100644 --- a/src/osgUtil/GLObjectsVisitor.cpp +++ b/src/osgUtil/GLObjectsVisitor.cpp @@ -42,7 +42,7 @@ void GLObjectsVisitor::apply(osg::Node& node) traverse(node); - bool programSetAfter = _renderInfo.getState()->getLastAppliedProgramObject()!=0; + bool programSetAfter = _renderInfo.getState()!=0 && _renderInfo.getState()->getLastAppliedProgramObject()!=0; if (programSetBefore && !programSetAfter) { osg::State* state = _renderInfo.getState();