LayerManagerCommands: Fixing Access to Shadermap

- Fixing wrong reference to shaderMap

diff --git a/LayerManagerCommands/src/ShaderSetUniformsCommand.cpp b/LayerManagerCommands/src/ShaderSetUniformsCommand.cpp
index cf9c98f..7c5148c 100644 (file)
--- a/LayerManagerCommands/src/ShaderSetUniformsCommand.cpp
+++ b/LayerManagerCommands/src/ShaderSetUniformsCommand.cpp
@@ -35,7 +35,7 @@ ExecutionResult ShaderSetUniformsCommand::execute(ICommandExecutor* executor)
     ExecutionResult result = ExecutionSuccessRedraw;
 
     // get shader by its ID
-    ShaderMap shaderMap = scene.m_shaderMap;
+    ShaderMap &shaderMap = scene.m_shaderMap;
     ShaderMapIterator iter = shaderMap.find(m_shaderid);
     ShaderMapIterator iterEnd = shaderMap.end();
 

diff --git a/LayerManagerCommands/src/SurfaceSetShaderCommand.cpp b/LayerManagerCommands/src/SurfaceSetShaderCommand.cpp
index 13b771d..ea1068e 100644 (file)
--- a/LayerManagerCommands/src/SurfaceSetShaderCommand.cpp
+++ b/LayerManagerCommands/src/SurfaceSetShaderCommand.cpp
@@ -51,7 +51,7 @@ ExecutionResult SurfaceSetShaderCommand::execute(ICommandExecutor* executor)
         Shader* shader = NULL;
 
         // get shader by its ID
-        ShaderMap shaderMap = scene.m_shaderMap;
+        ShaderMap &shaderMap = scene.m_shaderMap;
         ShaderMapIterator iter = shaderMap.find(m_shaderid);
         ShaderMapIterator iterEnd = shaderMap.end();
         if (iter != iterEnd)

diff --git a/LayerManagerPlugins/Renderers/Base/include/RenderUtil.h b/LayerManagerPlugins/Renderers/Base/include/RenderUtil.h
index fffdb75..c31c8bd 100644 (file)
--- a/LayerManagerPlugins/Renderers/Base/include/RenderUtil.h
+++ b/LayerManagerPlugins/Renderers/Base/include/RenderUtil.h
@@ -226,6 +226,7 @@ static GLuint RenderUtilLoadShaderSources(const char* vertFile, const char* frag
     prog = glCreateProgram();
     if (prog==0)
     {
+        LOG_DEBUG("RenderUtilShaderDebug","glError occured : " << glGetError()); 
         LOG_DEBUG("RenderUtilShaderDebug","could not create prog, prog is 0");
     }