diff options
| author | Dalai Felinto <dfelinto@gmail.com> | 2013-05-09 01:43:35 +0400 |
|---|---|---|
| committer | Dalai Felinto <dfelinto@gmail.com> | 2013-05-09 01:43:35 +0400 |
| commit | 102c0d76e9c2e38cd22b34f32cde97dc770a72cd (patch) | |
| tree | 20c3b8ebf802aa29596ddc522bc5e83e1d56f6ec /source/gameengine | |
| parent | e0edac4952a26a2e6e627a74ad84c8bba2886e80 (diff) | |
bugfix: [#31757] setGLSLMaterialSetting has no effect
original patch by me, with contribution from HG1 and Florian Völker
bug introduced in rev. 40113
Diffstat (limited to 'source/gameengine')
| -rw-r--r-- | source/gameengine/Ketsji/KX_PythonInit.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
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(); |