From 648dec3411a526eba9ac3ae2501038028ece4bc7 Mon Sep 17 00:00:00 2001
From: Mitchell Stokes <mogurijin@gmail.com>
Date: Mon, 21 Feb 2011 23:41:47 +0000
Subject: 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.
---
 source/gameengine/Ketsji/KX_BlenderMaterial.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(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 745045ff784..950a605c451 100644
--- a/source/gameengine/Ketsji/KX_BlenderMaterial.h
+++ b/source/gameengine/Ketsji/KX_BlenderMaterial.h
@@ -91,9 +91,9 @@ public:
 	
 	virtual void Replace_IScene(SCA_IScene *val)
 	{
+		mScene= static_cast<KX_Scene *>(val);
 		if (mBlenderShader)
 		{
-			mScene= static_cast<KX_Scene *>(val);
 			mBlenderShader->SetScene(mScene);
 		}
 	};
-- 
cgit v1.2.3