From 102c0d76e9c2e38cd22b34f32cde97dc770a72cd Mon Sep 17 00:00:00 2001
From: Dalai Felinto <dfelinto@gmail.com>
Date: Wed, 8 May 2013 21:43:35 +0000
Subject: [PATCH] =?UTF-8?q?bugfix:=20[#31757]=20setGLSLMaterialSetting=20h?=
 =?UTF-8?q?as=20no=20effect=20original=20patch=20by=20me,=20with=20contrib?=
 =?UTF-8?q?ution=20from=20HG1=20and=20Florian=20V=C3=B6lker?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

bug introduced in rev. 40113
---
 source/gameengine/Ketsji/KX_PythonInit.cpp | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/source/gameengine/Ketsji/KX_PythonInit.cpp b/source/gameengine/Ketsji/KX_PythonInit.cpp
index da605508762..69b37ceae7a 100644
--- a/source/gameengine/Ketsji/KX_PythonInit.cpp
+++ b/source/gameengine/Ketsji/KX_PythonInit.cpp
@@ -1183,6 +1183,10 @@ static PyObject *gPySetGLSLMaterialSetting(PyObject *,
 	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();