From f2f085bc3f8aabfca270457642b706fd75ab9845 Mon Sep 17 00:00:00 2001 From: Robert Osfield Date: Mon, 14 Jun 2010 15:22:35 +0000 Subject: [PATCH] From Stephan Huber, "the IncrementalCompileOperation-class throws away compiled compile-sets, when no compileCompletedCallback is set. Attached you'll find a simple fix for this bug." --- src/osgUtil/IncrementalCompileOperation.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/osgUtil/IncrementalCompileOperation.cpp b/src/osgUtil/IncrementalCompileOperation.cpp index 05854dd50..576a9b631 100644 --- a/src/osgUtil/IncrementalCompileOperation.cpp +++ b/src/osgUtil/IncrementalCompileOperation.cpp @@ -410,9 +410,9 @@ void IncrementalCompileOperation::operator () (osg::GraphicsContext* context) } } - if (csCompleted && cs->_compileCompletedCallback.valid()) + if (csCompleted) { - if (cs->_compileCompletedCallback->compileCompleted(cs)) + if (cs->_compileCompletedCallback.valid() && cs->_compileCompletedCallback->compileCompleted(cs)) { // callback will handle merging of subgraph so no need to place CompileSet in merge. }