diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2012-11-11 04:39:08 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2012-11-11 04:39:08 +0400 |
| commit | dfc55421dfed71b3b9cc074d1d3919bd02168ad7 (patch) | |
| tree | 169e16da6e3589901236858cbc5586a1c5098745 /source/gameengine/Ketsji/KX_BlenderMaterial.cpp | |
| parent | f8af8100d28910202f0b34f5aafea30321d59842 (diff) | |
game engine material conversion: don't use the material to convert vertex colors, then extract back out (pre face).
Diffstat (limited to 'source/gameengine/Ketsji/KX_BlenderMaterial.cpp')
| -rw-r--r-- | source/gameengine/Ketsji/KX_BlenderMaterial.cpp | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/source/gameengine/Ketsji/KX_BlenderMaterial.cpp b/source/gameengine/Ketsji/KX_BlenderMaterial.cpp index 2154beeb205..cb995c3f738 100644 --- a/source/gameengine/Ketsji/KX_BlenderMaterial.cpp +++ b/source/gameengine/Ketsji/KX_BlenderMaterial.cpp @@ -124,7 +124,7 @@ MTFace* KX_BlenderMaterial::GetMTFace(void) const unsigned int* KX_BlenderMaterial::GetMCol(void) const { // fonts on polys - return mMaterial->rgb; + return &mMaterial->m_mcol; } void KX_BlenderMaterial::GetMaterialRGBAColor(unsigned char *rgba) const @@ -138,6 +138,11 @@ void KX_BlenderMaterial::GetMaterialRGBAColor(unsigned char *rgba) const RAS_IPolyMaterial::GetMaterialRGBAColor(rgba); } +bool KX_BlenderMaterial::IsMaterial(BL_Material *bl_mat) const +{ + return (mMaterial == bl_mat); +} + Material *KX_BlenderMaterial::GetBlenderMaterial() const { return mMaterial->material; |