diff options
author | Campbell Barton <ideasman42@gmail.com> | 2009-08-01 03:42:22 +0400 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2009-08-01 03:42:22 +0400 |
commit | 0b3fd395ef3c6d9f3a83712abe2903cb661e94eb (patch) | |
tree | 5b40726d5a0def595cfbf2b397817b257387c12c /source/gameengine/Rasterizer | |
parent | fe850bd1637b9d0efd28cfcc648903172d7b9303 (diff) | |
parent | 0949d48d25efdb703e7b411b4403f3cdf0eb5308 (diff) |
svn merge https://svn.blender.org/svnroot/bf-blender/trunk/blender -r22075:22099
Diffstat (limited to 'source/gameengine/Rasterizer')
-rw-r--r-- | source/gameengine/Rasterizer/RAS_IPolygonMaterial.cpp | 14 | ||||
-rw-r--r-- | source/gameengine/Rasterizer/RAS_IPolygonMaterial.h | 7 |
2 files changed, 4 insertions, 17 deletions
diff --git a/source/gameengine/Rasterizer/RAS_IPolygonMaterial.cpp b/source/gameengine/Rasterizer/RAS_IPolygonMaterial.cpp index 6af00d63c2d..cb5c5a12397 100644 --- a/source/gameengine/Rasterizer/RAS_IPolygonMaterial.cpp +++ b/source/gameengine/Rasterizer/RAS_IPolygonMaterial.cpp @@ -46,8 +46,7 @@ void RAS_IPolyMaterial::Initialize( int mode, int transp, bool alpha, - bool zsort, - int lightlayer) + bool zsort) { m_texturename = texname; m_materialname = matname; @@ -59,7 +58,6 @@ void RAS_IPolyMaterial::Initialize( m_transp = transp; m_alpha = alpha; m_zsort = zsort; - //m_lightlayer = lightlayer; m_polymatid = m_newpolymatid++; m_flag = 0; m_multimode = 0; @@ -80,7 +78,6 @@ RAS_IPolyMaterial::RAS_IPolyMaterial() m_transp(0), m_alpha(false), m_zsort(false), - //m_lightlayer(0), m_polymatid(0), m_flag(0), m_multimode(0) @@ -100,8 +97,7 @@ RAS_IPolyMaterial::RAS_IPolyMaterial(const STR_String& texname, int mode, int transp, bool alpha, - bool zsort, - int lightlayer) + bool zsort) : m_texturename(texname), m_materialname(matname), m_materialindex(materialindex), @@ -112,7 +108,6 @@ RAS_IPolyMaterial::RAS_IPolyMaterial(const STR_String& texname, m_transp(transp), m_alpha(alpha), m_zsort(zsort), - //m_lightlayer(lightlayer), m_polymatid(m_newpolymatid++), m_flag(0), m_multimode(0) @@ -172,11 +167,6 @@ bool RAS_IPolyMaterial::Less(const RAS_IPolyMaterial& rhs) const return m_polymatid < rhs.m_polymatid; } -//int RAS_IPolyMaterial::GetLightLayer() const -//{ -// return m_lightlayer; -//} - bool RAS_IPolyMaterial::IsAlpha() const { return m_alpha || m_zsort; diff --git a/source/gameengine/Rasterizer/RAS_IPolygonMaterial.h b/source/gameengine/Rasterizer/RAS_IPolygonMaterial.h index e19db35ccb5..a01196ef307 100644 --- a/source/gameengine/Rasterizer/RAS_IPolygonMaterial.h +++ b/source/gameengine/Rasterizer/RAS_IPolygonMaterial.h @@ -73,7 +73,6 @@ protected: int m_transp; bool m_alpha; bool m_zsort; - //int m_lightlayer; int m_materialindex; unsigned int m_polymatid; @@ -110,8 +109,7 @@ public: int mode, int transp, bool alpha, - bool zsort, - int lightlayer); + bool zsort); void Initialize(const STR_String& texname, const STR_String& matname, int materialindex, @@ -121,8 +119,7 @@ public: int mode, int transp, bool alpha, - bool zsort, - int lightlayer); + bool zsort); virtual ~RAS_IPolyMaterial() {}; /** |