[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [56605] trunk/blender/source/gameengine/ Ketsji/KX_PythonInit.cpp: bugfix: [#31757] setGLSLMaterialSetting has no effect

[Dalai Felinto]

Revision: 56605
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=56605
Author:   dfelinto
Date:     2013-05-08 21:43:35 +0000 (Wed, 08 May 2013)
Log Message:
-----------
bugfix: [#31757] setGLSLMaterialSetting has no effect
original patch by me, with contribution from HG1 and Florian V?\195?\182lker

bug introduced in rev. 40113

Modified Paths:
--------------
    trunk/blender/source/gameengine/Ketsji/KX_PythonInit.cpp

Modified: trunk/blender/source/gameengine/Ketsji/KX_PythonInit.cpp
===================================================================
--- trunk/blender/source/gameengine/Ketsji/KX_PythonInit.cpp	2013-05-08 21:41:47 UTC (rev 56604)
+++ trunk/blender/source/gameengine/Ketsji/KX_PythonInit.cpp	2013-05-08 21:43:35 UTC (rev 56605)
@@ -1183,6 +1183,10 @@
 	else
 		gs->glslflag |= flag;
 
+	/* temporarily store the glsl settings in the scene for the GLSL materials */
+	GameData *gm= &(gp_KetsjiScene->GetBlenderScene()->gm);
+	gm->flag = gs->glslflag;
+
 	/* display lists and GLSL materials need to be remade */
 	if (sceneflag != gs->glslflag) {
 		GPU_materials_free();