From 6a473305af22468abfc4c4f8f3002dc0a97fffd7 Mon Sep 17 00:00:00 2001
From: Campbell Barton <ideasman42@gmail.com>
Date: Mon, 30 Dec 2013 15:49:13 +1100
Subject: Fix T37920: BGE LibLoad failed for meshes with no materials

---
 source/gameengine/Rasterizer/RAS_MaterialBucket.cpp | 16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)

(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 0c715524218..b7a5804c069 100644
--- a/source/gameengine/Rasterizer/RAS_MaterialBucket.cpp
+++ b/source/gameengine/Rasterizer/RAS_MaterialBucket.cpp
@@ -558,7 +558,7 @@ RAS_MeshSlot* RAS_MaterialBucket::CopyMesh(RAS_MeshSlot *ms)
 	return &m_meshSlots.back();
 }
 
-void RAS_MaterialBucket::RemoveMesh(RAS_MeshSlot* ms)
+void RAS_MaterialBucket::RemoveMeshSlot(RAS_MeshSlot *ms)
 {
 	list<RAS_MeshSlot>::iterator it;
 
@@ -570,6 +570,20 @@ void RAS_MaterialBucket::RemoveMesh(RAS_MeshSlot* ms)
 	}
 }
 
+void RAS_MaterialBucket::RemoveMesh(RAS_MeshObject *mesh)
+{
+	list<RAS_MeshSlot>::iterator it;
+	it=m_meshSlots.begin();
+	while (it != m_meshSlots.end()) {
+		if ((*it).m_mesh == mesh) {
+			m_meshSlots.erase(it++);
+		}
+		else {
+			++it;
+		}
+	}
+}
+
 list<RAS_MeshSlot>::iterator RAS_MaterialBucket::msBegin()
 {
 	return m_meshSlots.begin();
-- 
cgit v1.2.3