diff options
| author | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2008-07-10 16:47:20 +0400 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2008-07-10 16:47:20 +0400 |
| commit | 99fdf27af92b9bd9d05c108f2c2c8a240c5536bc (patch) | |
| tree | 0e7d2c4b425a5d3906a7841e5919e384e0bc27a4 /source/gameengine/Rasterizer/RAS_MeshObject.h | |
| parent | 3d7358539df4526ffc2c2bbd40cf2001c5acf374 (diff) | |
Sync with Apricot Game Engine
=============================
* Clean up and optimizations in skinned/deformed mesh code.
* Compatibility fixes and clean up in the rasterizer.
* Changes related to GLSL shadow buffers which should have no
effect, to keep the code in sync with apricot.
Diffstat (limited to 'source/gameengine/Rasterizer/RAS_MeshObject.h')
| -rw-r--r-- | source/gameengine/Rasterizer/RAS_MeshObject.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/source/gameengine/Rasterizer/RAS_MeshObject.h b/source/gameengine/Rasterizer/RAS_MeshObject.h index d9aa133efb2..0d06748f91f 100644 --- a/source/gameengine/Rasterizer/RAS_MeshObject.h +++ b/source/gameengine/Rasterizer/RAS_MeshObject.h @@ -142,7 +142,7 @@ protected: enum { BUCKET_MAX_INDICES = 65535 };//2048};//8192}; enum { BUCKET_MAX_TRIANGLES = 65535 }; - GEN_Map<class RAS_IPolyMaterial,KX_ArrayOptimizer*> m_matVertexArrayS; + GEN_Map<GEN_HashedPtr,KX_ArrayOptimizer*> m_matVertexArrayS; RAS_MaterialBucket::Set m_materials; Mesh* m_mesh; @@ -242,10 +242,10 @@ public: const MT_Vector3& normal, bool flat, RAS_IPolyMaterial* mat, - int orgindex + int origindex ); - const vecVertexArray& GetVertexCache (RAS_IPolyMaterial* mat); + vecVertexArray& GetVertexCache (RAS_IPolyMaterial* mat); int GetVertexArrayLength(RAS_IPolyMaterial* mat); |