From 07f0f9932c1cc3b76467e970d88da7fe816d1e21 Mon Sep 17 00:00:00 2001 From: gerrit Date: Wed, 13 Mar 2013 16:16:16 +0800 Subject: [PATCH] fixed: wrong prog id on change --- Source/System/State/Shader/Chunks/OSGShaderExecutableChunk.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Source/System/State/Shader/Chunks/OSGShaderExecutableChunk.cpp b/Source/System/State/Shader/Chunks/OSGShaderExecutableChunk.cpp index c7a086e8c..32d1760eb 100644 --- a/Source/System/State/Shader/Chunks/OSGShaderExecutableChunk.cpp +++ b/Source/System/State/Shader/Chunks/OSGShaderExecutableChunk.cpp @@ -664,7 +664,7 @@ void ShaderExecutableChunk::changeFrom(DrawEnv *pEnv, KeepProgActive); - uiProgId = pEnv->getActiveShader(); + uiProgId = GLuint(pWin->getGLObjectId(getGLId())); if(uiProgId == 0) return; -- 2.11.4.GIT