diff options
| author | Daniel Stokes <kupomail@gmail.com> | 2013-07-24 09:12:51 +0400 |
|---|---|---|
| committer | Daniel Stokes <kupomail@gmail.com> | 2013-07-24 09:12:51 +0400 |
| commit | d0f225393cc4c65c1e2e9c2003f3a07eb18db28f (patch) | |
| tree | e3801b1afc4e6e91048d7c2d71ec300535654de5 /source/gameengine | |
| parent | ab8e2cb900277366e55d592da85355e1e8c3a0b5 (diff) | |
BGE Fix [#29575] Object not drawn in game engine
Implementing a GetBlenderImage for KX_BlenderMaterial so that modifiers draw correctly in multitexture mode. The preexisting limitation of 1 texture per material on objects with modifiers in multitexture mode still exists.
Diffstat (limited to 'source/gameengine')
| -rw-r--r-- | source/gameengine/Ketsji/KX_BlenderMaterial.cpp | 5 | ||||
| -rw-r--r-- | source/gameengine/Ketsji/KX_BlenderMaterial.h | 1 |
2 files changed, 6 insertions, 0 deletions
diff --git a/source/gameengine/Ketsji/KX_BlenderMaterial.cpp b/source/gameengine/Ketsji/KX_BlenderMaterial.cpp index 630b2f0b32a..28abdc898ae 100644 --- a/source/gameengine/Ketsji/KX_BlenderMaterial.cpp +++ b/source/gameengine/Ketsji/KX_BlenderMaterial.cpp @@ -157,6 +157,11 @@ Material *KX_BlenderMaterial::GetBlenderMaterial() const return mMaterial->material; } +Image *KX_BlenderMaterial::GetBlenderImage() const +{ + return mMaterial->tface.tpage; +} + Scene* KX_BlenderMaterial::GetBlenderScene() const { return mScene->GetBlenderScene(); diff --git a/source/gameengine/Ketsji/KX_BlenderMaterial.h b/source/gameengine/Ketsji/KX_BlenderMaterial.h index c34a49e1bde..0a2675f04a8 100644 --- a/source/gameengine/Ketsji/KX_BlenderMaterial.h +++ b/source/gameengine/Ketsji/KX_BlenderMaterial.h @@ -78,6 +78,7 @@ public: )const; Material* GetBlenderMaterial() const; + Image* GetBlenderImage() const; MTFace* GetMTFace(void) const; unsigned int* GetMCol(void) const; BL_Texture * getTex (unsigned int idx) { |