[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [30200] trunk/blender/source/gameengine/ Ketsji/KX_BlenderMaterial.h: Fixing a crash created by an earlier GLSL lighting fix for dynamic loading .

Mitchell Stokes mogurijin at gmail.com
Sun Jul 11 11:31:19 CEST 2010


Revision: 30200
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=30200
Author:   moguri
Date:     2010-07-11 11:31:19 +0200 (Sun, 11 Jul 2010)

Log Message:
-----------
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).

Modified Paths:
--------------
    trunk/blender/source/gameengine/Ketsji/KX_BlenderMaterial.h

Modified: trunk/blender/source/gameengine/Ketsji/KX_BlenderMaterial.h
===================================================================
--- trunk/blender/source/gameengine/Ketsji/KX_BlenderMaterial.h	2010-07-11 08:48:21 UTC (rev 30199)
+++ trunk/blender/source/gameengine/Ketsji/KX_BlenderMaterial.h	2010-07-11 09:31:19 UTC (rev 30200)
@@ -88,8 +88,11 @@
 	
 	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





More information about the Bf-blender-cvs mailing list