From 232d227170dbd1a656b9fa085ef5980eeec4787c Mon Sep 17 00:00:00 2001 From: Robert Osfield Date: Wed, 21 Dec 2016 11:02:29 +0000 Subject: [PATCH] Changed Program::apply() to Program::compileGLObjects() to avoid the Program::apply() setting of setLastAppliedProgramObjects for affect current state. --- src/osgUtil/IncrementalCompileOperation.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/osgUtil/IncrementalCompileOperation.cpp b/src/osgUtil/IncrementalCompileOperation.cpp index 747592c79..7d6a4eb72 100644 --- a/src/osgUtil/IncrementalCompileOperation.cpp +++ b/src/osgUtil/IncrementalCompileOperation.cpp @@ -297,7 +297,7 @@ double IncrementalCompileOperation::CompileProgramOp::estimatedTimeForCompile(Co bool IncrementalCompileOperation::CompileProgramOp::compile(CompileInfo& compileInfo) { //OSG_NOTICE<<"CompileProgramOp::compile(..)"<apply(*compileInfo.getState()); + _program->compileGLObjects(*compileInfo.getState()); return true; }