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/Ketsji/KX_PolyProxy.cpp | |
| parent | a35e9daaef3c4342e7c4881dbb535c96ecc7bc34 (diff) | |
BGE Rasterizer Cleanup: Removing the Singletexture material mode. More conversion code will probably be needed.
Diffstat (limited to 'source/gameengine/Ketsji/KX_PolyProxy.cpp')
| -rw-r--r-- | source/gameengine/Ketsji/KX_PolyProxy.cpp | 13 |
1 files changed, 2 insertions, 11 deletions
diff --git a/source/gameengine/Ketsji/KX_PolyProxy.cpp b/source/gameengine/Ketsji/KX_PolyProxy.cpp index 83092c7d89c..ea26cb56e52 100644 --- a/source/gameengine/Ketsji/KX_PolyProxy.cpp +++ b/source/gameengine/Ketsji/KX_PolyProxy.cpp @@ -36,7 +36,6 @@ #include "KX_MeshProxy.h" #include "RAS_MeshObject.h" #include "KX_BlenderMaterial.h" -#include "KX_PolygonMaterial.h" #include "KX_PyMath.h" @@ -259,16 +258,8 @@ KX_PYMETHODDEF_DOC_NOARGS(KX_PolyProxy, getMaterial, "getMaterial() : returns a material\n") { RAS_IPolyMaterial *polymat = m_polygon->GetMaterial()->GetPolyMaterial(); - if (polymat->GetFlag() & RAS_BLENDERMAT) - { - KX_BlenderMaterial* mat = static_cast<KX_BlenderMaterial*>(polymat); - return mat->GetProxy(); - } - else - { - KX_PolygonMaterial* mat = static_cast<KX_PolygonMaterial*>(polymat); - return mat->GetProxy(); - } + KX_BlenderMaterial* mat = static_cast<KX_BlenderMaterial*>(polymat); + return mat->GetProxy(); } #endif // WITH_PYTHON |