diff options
| author | Kester Maddock <Christopher.Maddock.1@uni.massey.ac.nz> | 2004-05-04 13:34:02 +0400 |
|---|---|---|
| committer | Kester Maddock <Christopher.Maddock.1@uni.massey.ac.nz> | 2004-05-04 13:34:02 +0400 |
| commit | f03fa79d28a112c39fcbab5d71b952333dc66fac (patch) | |
| tree | 349af2572f240d3b78312cf7f28d0d949e10f8a5 /source/gameengine/Rasterizer/RAS_IPolygonMaterial.cpp | |
| parent | 79f3e880217215d5af09a9083f868ce7b80baaa5 (diff) | |
Fix for bug #945 getVertexArrayLength(x) returns different values on different runs of the game engine.
http://projects.blender.org/tracker/index.php?func=detail&aid=945&group_id=9&atid=125
The material buckets were being sorted by pointer (ie their location in memory.)
Also fixed find shared verticies.
Diffstat (limited to 'source/gameengine/Rasterizer/RAS_IPolygonMaterial.cpp')
| -rw-r--r-- | source/gameengine/Rasterizer/RAS_IPolygonMaterial.cpp | 15 |
1 files changed, 14 insertions, 1 deletions
diff --git a/source/gameengine/Rasterizer/RAS_IPolygonMaterial.cpp b/source/gameengine/Rasterizer/RAS_IPolygonMaterial.cpp index 88fb5349764..33cdc43afd8 100644 --- a/source/gameengine/Rasterizer/RAS_IPolygonMaterial.cpp +++ b/source/gameengine/Rasterizer/RAS_IPolygonMaterial.cpp @@ -79,7 +79,20 @@ bool RAS_IPolyMaterial::Equals(const RAS_IPolyMaterial& lhs) const ); } - +bool RAS_IPolyMaterial::Less(const RAS_IPolyMaterial& rhs) const +{ + return ( + this->m_materialname < rhs.m_materialname || + this->m_texturename < rhs.m_texturename || + this->m_lightlayer < rhs.m_lightlayer || + this->m_tile < rhs.m_tile || + this->m_tilexrep < rhs.m_tilexrep || + this->m_tileyrep < rhs.m_tileyrep || + this->m_transparant < rhs.m_transparant || + this->m_drawingmode < rhs.m_drawingmode || + this->m_bIsTriangle < rhs.m_bIsTriangle + ); +} int RAS_IPolyMaterial::GetLightLayer() { |