[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [35041] trunk/blender/source/gameengine/ Ketsji/KX_BlenderMaterial.h: Fix for bug #25804 (LibLoad' ed scene objects material CRASH when doing mat.getShader())

[Mitchell Stokes]

Revision: 35041
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=35041
Author:   moguri
Date:     2011-02-21 23:41:47 +0000 (Mon, 21 Feb 2011)
Log Message:
-----------
Fix for bug #25804 (LibLoad'ed scene objects material CRASH when doing mat.getShader())

X_Material's mScene member variable wasn't properly set on merge if it didn't have an mBlenderShader defined. This patch always makes sure it gets set on merge.

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	2011-02-21 20:26:37 UTC (rev 35040)
+++ trunk/blender/source/gameengine/Ketsji/KX_BlenderMaterial.h	2011-02-21 23:41:47 UTC (rev 35041)
@@ -91,9 +91,9 @@
 	
 	virtual void Replace_IScene(SCA_IScene *val)
 	{
+		mScene= static_cast<KX_Scene *>(val);
 		if (mBlenderShader)
 		{
-			mScene= static_cast<KX_Scene *>(val);
 			mBlenderShader->SetScene(mScene);
 		}
 	};