kannonier8/blender
1
0
Fork 0
forked from bartvdbraak/blender
Code Pull Requests Activity

Fix for bug #25804 (LibLoad'ed scene objects material CRASH when doing mat.getShader())

Browse Source 
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.
This commit is contained in:
Mitchell Stokes 2011-02-21 23:41:47 +00:00
parent ea20a27240
commit 648dec3411
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
source/gameengine/Ketsji/KX_BlenderMaterial.h
View File

@ -91,9 +91,9 @@ public:
virtual void Replace_IScene(SCA_IScene *val) virtual void Replace_IScene(SCA_IScene *val)
{ {
mScene= static_cast<KX_Scene *>(val);
if (mBlenderShader) if (mBlenderShader)
{ {
mScene= static_cast<KX_Scene *>(val);
mBlenderShader->SetScene(mScene); mBlenderShader->SetScene(mScene);
} }
}; };