diff options
| author | Mitchell Stokes <mogurijin@gmail.com> | 2011-02-22 02:41:47 +0300 |
|---|---|---|
| committer | Mitchell Stokes <mogurijin@gmail.com> | 2011-02-22 02:41:47 +0300 |
| commit | 648dec3411a526eba9ac3ae2501038028ece4bc7 (patch) | |
| tree | b6be37ca04af02ac122a1728868a78fd2c6de81f /source/gameengine/Ketsji/KX_BlenderMaterial.h | |
| parent | ea20a2724047283bc5318087c791cdd216a7fb6f (diff) | |
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.
Diffstat (limited to 'source/gameengine/Ketsji/KX_BlenderMaterial.h')
| -rw-r--r-- | source/gameengine/Ketsji/KX_BlenderMaterial.h | 2 |
1 files changed, 1 insertions, 1 deletions
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); } }; |