diff options
Diffstat (limited to 'source/gameengine/GamePlayer')
4 files changed, 8 insertions, 7 deletions
diff --git a/source/gameengine/GamePlayer/common/GPC_PolygonMaterial.cpp b/source/gameengine/GamePlayer/common/GPC_PolygonMaterial.cpp index 76a61da6b62..472d921dbe9 100644 --- a/source/gameengine/GamePlayer/common/GPC_PolygonMaterial.cpp +++ b/source/gameengine/GamePlayer/common/GPC_PolygonMaterial.cpp @@ -361,10 +361,10 @@ static int my_set_tpage(TFace *tface) GPC_PolygonMaterial::GPC_PolygonMaterial(const STR_String& texname, bool ba, const STR_String& matname, - int tile, int tileXrep, int tileYrep, int mode, int transparant, + int tile, int tileXrep, int tileYrep, int mode, bool transparant, bool zsort, int lightlayer, bool bIsTriangle, void* clientobject, void* tpage) : RAS_IPolyMaterial(texname, ba, matname, tile, tileXrep, tileYrep, mode, - transparant, lightlayer, bIsTriangle, clientobject), m_tface((struct TFace*)tpage) + transparant, zsort, lightlayer, bIsTriangle, clientobject), m_tface((struct TFace*)tpage) { // clear local caching info my_set_tpage(0); diff --git a/source/gameengine/GamePlayer/common/GPC_PolygonMaterial.h b/source/gameengine/GamePlayer/common/GPC_PolygonMaterial.h index b7df667408e..0a9c32eae46 100644 --- a/source/gameengine/GamePlayer/common/GPC_PolygonMaterial.h +++ b/source/gameengine/GamePlayer/common/GPC_PolygonMaterial.h @@ -41,7 +41,7 @@ class GPC_PolygonMaterial : public RAS_IPolyMaterial public: GPC_PolygonMaterial(const STR_String& texname, bool ba, const STR_String& matname, - int tile, int tileXrep, int tileYrep, int mode, int transparant, + int tile, int tileXrep, int tileYrep, int mode, bool transparant, bool zsort, int lightlayer, bool bIsTriangle, void* clientobject, void* tpage); virtual ~GPC_PolygonMaterial(void); diff --git a/source/gameengine/GamePlayer/common/GPC_RenderTools.cpp b/source/gameengine/GamePlayer/common/GPC_RenderTools.cpp index 79d769f7a1a..4e28bb4a449 100644 --- a/source/gameengine/GamePlayer/common/GPC_RenderTools.cpp +++ b/source/gameengine/GamePlayer/common/GPC_RenderTools.cpp @@ -312,11 +312,11 @@ void GPC_RenderTools::BL_RenderText( RAS_IPolyMaterial* GPC_RenderTools::CreateBlenderPolyMaterial( const STR_String &texname, - bool ba,const STR_String& matname,int tile,int tilexrep,int tileyrep,int mode,int transparant,int lightlayer - ,bool bIsTriangle,void* clientobject,void* tface) + bool ba,const STR_String& matname,int tile,int tilexrep,int tileyrep,int mode,bool transparant, bool zsort, + int lightlayer,bool bIsTriangle,void* clientobject,void* tface) { return new GPC_PolygonMaterial(texname, ba,matname,tile,tilexrep,tileyrep, - mode,transparant,lightlayer,bIsTriangle,clientobject,tface); + mode,transparant,zsort,lightlayer,bIsTriangle,clientobject,tface); } diff --git a/source/gameengine/GamePlayer/common/GPC_RenderTools.h b/source/gameengine/GamePlayer/common/GPC_RenderTools.h index 3a878244e47..432bf393e3a 100644 --- a/source/gameengine/GamePlayer/common/GPC_RenderTools.h +++ b/source/gameengine/GamePlayer/common/GPC_RenderTools.h @@ -144,7 +144,8 @@ public: int tile, int tilexrep,int tileyrep, int mode, - int transparant, + bool transparant, + bool zsort, int lightlayer, bool bIsTriangle, void* clientobject, |