Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKester Maddock <Christopher.Maddock.1@uni.massey.ac.nz>2004-05-04 17:17:46 +0400
committerKester Maddock <Christopher.Maddock.1@uni.massey.ac.nz>2004-05-04 17:17:46 +0400
commit648c21947c6c115209e5529de6e747e474fd64e2 (patch)
tree8549b49fef1e0df36552321ba7f280b71a952e40 /source/gameengine/Rasterizer/RAS_MeshObject.h
parentf03fa79d28a112c39fcbab5d71b952333dc66fac (diff)
Use a better compare function for RAS_IPolygonMaterial
Fix sharing verticies - must test pos, normal, uv & colour before sharing (not just index)
Diffstat (limited to 'source/gameengine/Rasterizer/RAS_MeshObject.h')
-rw-r--r--source/gameengine/Rasterizer/RAS_MeshObject.h8
1 files changed, 5 insertions, 3 deletions
diff --git a/source/gameengine/Rasterizer/RAS_MeshObject.h b/source/gameengine/Rasterizer/RAS_MeshObject.h
index 78e142fda8a..5e823621588 100644
--- a/source/gameengine/Rasterizer/RAS_MeshObject.h
+++ b/source/gameengine/Rasterizer/RAS_MeshObject.h
@@ -89,10 +89,11 @@ class RAS_MatArrayIndex
public:
int m_arrayindex1;
- int m_matid;
+ RAS_IPolyMaterial* m_matid;
int m_array;
int m_index;
+/*
inline bool Less(const RAS_MatArrayIndex& lhs) const {
bool result =
( (m_matid < lhs.m_matid) ||
@@ -104,13 +105,14 @@ public:
return result;
}
-
+*/
};
+/*
inline bool operator <( const RAS_MatArrayIndex& rhs,const RAS_MatArrayIndex& lhs)
{
return ( rhs.Less(lhs));
-}
+}*/
/**
* RAS_MeshObject stores mesh data for the renderer.