From 53fd3847bcb577d580a16217a27b67fd3f679969 Mon Sep 17 00:00:00 2001 From: Benoit Bolsee Date: Sat, 18 Apr 2009 09:14:51 +0000 Subject: BGE: restore a feature that was lost in 2.48: sharing of display lists between duplicated objects. --- source/gameengine/Rasterizer/RAS_MaterialBucket.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'source/gameengine/Rasterizer/RAS_MaterialBucket.cpp') diff --git a/source/gameengine/Rasterizer/RAS_MaterialBucket.cpp b/source/gameengine/Rasterizer/RAS_MaterialBucket.cpp index 5ddcdd310b0..6beab28d61f 100644 --- a/source/gameengine/Rasterizer/RAS_MaterialBucket.cpp +++ b/source/gameengine/Rasterizer/RAS_MaterialBucket.cpp @@ -60,7 +60,7 @@ RAS_MeshSlot::RAS_MeshSlot() RAS_MeshSlot::~RAS_MeshSlot() { - vector::iterator it; + RAS_DisplayArrayList::iterator it; #ifdef USE_SPLIT Split(true); @@ -83,7 +83,7 @@ RAS_MeshSlot::~RAS_MeshSlot() RAS_MeshSlot::RAS_MeshSlot(const RAS_MeshSlot& slot) { - vector::iterator it; + RAS_DisplayArrayList::iterator it; m_clientObj = NULL; m_pDeformer = NULL; @@ -205,7 +205,7 @@ RAS_DisplayArray *RAS_MeshSlot::CurrentDisplayArray() void RAS_MeshSlot::SetDisplayArray(int numverts) { - vector::iterator it; + RAS_DisplayArrayList::iterator it; RAS_DisplayArray *darray = NULL; for(it=m_displayArrays.begin(); it!=m_displayArrays.end(); it++) { @@ -297,7 +297,7 @@ bool RAS_MeshSlot::Equals(RAS_MeshSlot *target) bool RAS_MeshSlot::Join(RAS_MeshSlot *target, MT_Scalar distance) { - vector::iterator it; + RAS_DisplayArrayList::iterator it; iterator mit; size_t i; @@ -362,7 +362,7 @@ bool RAS_MeshSlot::Split(bool force) { list::iterator jit; RAS_MeshSlot *target = m_joinSlot; - vector::iterator it, jt; + RAS_DisplayArrayList::iterator it, jt; iterator mit; size_t i, found0 = 0, found1 = 0; -- cgit v1.2.3