diff options
| author | Mitchell Stokes <mogurijin@gmail.com> | 2013-11-04 23:21:32 +0400 |
|---|---|---|
| committer | Mitchell Stokes <mogurijin@gmail.com> | 2013-11-04 23:21:32 +0400 |
| commit | c1e617d26bf72f6fe2682c14e31b84864b465e85 (patch) | |
| tree | 13a85d9d469fb679a0f025260bda32c93c48537d /source/gameengine/Ketsji | |
| parent | 5348682f3aad87c1c598af04d407a91a50b71e7e (diff) | |
BGE Rasterizer Cleanup: Removing the need to reference KX_BlenderMaterial or KX_PolygonMaterial in RAS_OpenGLRasterizer.
Diffstat (limited to 'source/gameengine/Ketsji')
| -rw-r--r-- | source/gameengine/Ketsji/KX_BlenderMaterial.cpp | 4 | ||||
| -rw-r--r-- | source/gameengine/Ketsji/KX_BlenderMaterial.h | 4 | ||||
| -rw-r--r-- | source/gameengine/Ketsji/KX_PolygonMaterial.h | 4 |
3 files changed, 6 insertions, 6 deletions
diff --git a/source/gameengine/Ketsji/KX_BlenderMaterial.cpp b/source/gameengine/Ketsji/KX_BlenderMaterial.cpp index e5b8159753b..efaaed7b567 100644 --- a/source/gameengine/Ketsji/KX_BlenderMaterial.cpp +++ b/source/gameengine/Ketsji/KX_BlenderMaterial.cpp @@ -129,13 +129,13 @@ KX_BlenderMaterial::~KX_BlenderMaterial() OnExit(); } -MTFace* KX_BlenderMaterial::GetMTFace(void) const +MTFace* KX_BlenderMaterial::GetMTFace() const { // fonts on polys return &mMaterial->tface; } -unsigned int* KX_BlenderMaterial::GetMCol(void) const +unsigned int* KX_BlenderMaterial::GetMCol() const { // fonts on polys return mMaterial->rgb; diff --git a/source/gameengine/Ketsji/KX_BlenderMaterial.h b/source/gameengine/Ketsji/KX_BlenderMaterial.h index 0a2675f04a8..b7c64215eaf 100644 --- a/source/gameengine/Ketsji/KX_BlenderMaterial.h +++ b/source/gameengine/Ketsji/KX_BlenderMaterial.h @@ -79,8 +79,8 @@ public: Material* GetBlenderMaterial() const; Image* GetBlenderImage() const; - MTFace* GetMTFace(void) const; - unsigned int* GetMCol(void) const; + MTFace* GetMTFace() const; + unsigned int* GetMCol() const; BL_Texture * getTex (unsigned int idx) { return (idx < MAXTEX) ? mTextures + idx : NULL; } diff --git a/source/gameengine/Ketsji/KX_PolygonMaterial.h b/source/gameengine/Ketsji/KX_PolygonMaterial.h index 89bfb4ff9fb..380ac5f523d 100644 --- a/source/gameengine/Ketsji/KX_PolygonMaterial.h +++ b/source/gameengine/Ketsji/KX_PolygonMaterial.h @@ -118,12 +118,12 @@ public: * Returns the Blender texture face structure that is used for this material. * \return The material's texture face. */ - MTFace* GetMTFace(void) const + MTFace* GetMTFace() const { return &m_tface; } - unsigned int* GetMCol(void) const + unsigned int* GetMCol() const { return &m_mcol; } |