diff options
| author | Mitchell Stokes <mogurijin@gmail.com> | 2010-07-11 13:31:19 +0400 |
|---|---|---|
| committer | Mitchell Stokes <mogurijin@gmail.com> | 2010-07-11 13:31:19 +0400 |
| commit | 1a98efa426f23d16a12e8c28577474543ea9f501 (patch) | |
| tree | c0f027dc0211e15f2c2a2c801f934c5c6b69ab2f /source/gameengine/Ketsji/KX_BlenderMaterial.h | |
| parent | 4497bd3b90eb76609176ba06009c2843a62fadbe (diff) | |
Fixing a crash created by an earlier GLSL lighting fix for dynamic loading. When implementing the fix I forgot to check for materials that did not have a blender shader (ie, non GLSL materials).
Diffstat (limited to 'source/gameengine/Ketsji/KX_BlenderMaterial.h')
| -rw-r--r-- | source/gameengine/Ketsji/KX_BlenderMaterial.h | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/source/gameengine/Ketsji/KX_BlenderMaterial.h b/source/gameengine/Ketsji/KX_BlenderMaterial.h index e28c43d1a23..5bf62ff6b7c 100644 --- a/source/gameengine/Ketsji/KX_BlenderMaterial.h +++ b/source/gameengine/Ketsji/KX_BlenderMaterial.h @@ -88,8 +88,11 @@ public: virtual void Replace_IScene(SCA_IScene *val) { - mScene= static_cast<KX_Scene *>(val); - mBlenderShader->SetScene(mScene); + if (mBlenderShader) + { + mScene= static_cast<KX_Scene *>(val); + mBlenderShader->SetScene(mScene); + } }; #ifndef DISABLE_PYTHON |