From 1a98efa426f23d16a12e8c28577474543ea9f501 Mon Sep 17 00:00:00 2001
From: Mitchell Stokes <mogurijin@gmail.com>
Date: Sun, 11 Jul 2010 09:31:19 +0000
Subject: 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).

---
 source/gameengine/Ketsji/KX_BlenderMaterial.h | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

(limited to 'source/gameengine/Ketsji/KX_BlenderMaterial.h')

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
-- 
cgit v1.2.3