diff options
author | Mitchell Stokes <mogurijin@gmail.com> | 2013-11-04 23:21:50 +0400 |
---|---|---|
committer | Mitchell Stokes <mogurijin@gmail.com> | 2013-11-04 23:21:50 +0400 |
commit | 0cec5c63dabf1fa8a1c54642cc029bbf0001ef01 (patch) | |
tree | bc390a19c826721c1bef0b569226e0bc9c14304f /source/gameengine/VideoTexture | |
parent | a35e9daaef3c4342e7c4881dbb535c96ecc7bc34 (diff) |
BGE Rasterizer Cleanup: Removing the Singletexture material mode. More conversion code will probably be needed.
Diffstat (limited to 'source/gameengine/VideoTexture')
-rw-r--r-- | source/gameengine/VideoTexture/Texture.cpp | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/source/gameengine/VideoTexture/Texture.cpp b/source/gameengine/VideoTexture/Texture.cpp index 1efbc50bfe0..c187f7c41c1 100644 --- a/source/gameengine/VideoTexture/Texture.cpp +++ b/source/gameengine/VideoTexture/Texture.cpp @@ -40,7 +40,6 @@ #include "DNA_meshdata_types.h" #include "DNA_image_types.h" #include "IMB_imbuf_types.h" -#include "KX_PolygonMaterial.h" #include "MEM_guardedalloc.h" @@ -229,19 +228,12 @@ static int Texture_init(Texture *self, PyObject *args, PyObject *kwds) { self->m_imgTexture = static_cast<KX_BlenderMaterial*>(mat)->getImage(texID); self->m_useMatTexture = false; - } else if (mat->GetFlag() & RAS_BLENDERMAT) + } else { // get blender material texture self->m_matTexture = static_cast<KX_BlenderMaterial*>(mat)->getTex(texID); self->m_useMatTexture = true; } - else - { - // get texture pointer from polygon material - MTFace * tface = static_cast<KX_PolygonMaterial*>(mat)->GetMTFace(); - self->m_imgTexture = (Image*)tface->tpage; - self->m_useMatTexture = false; - } } else if (lamp != NULL) { |