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:
authorCampbell Barton <ideasman42@gmail.com>2014-01-22 17:49:58 +0400
committerCampbell Barton <ideasman42@gmail.com>2014-01-22 17:50:01 +0400
commit51c32ac1996f3e6794b1fe29d4e03b10360f9455 (patch)
tree797273ebd87fe0824c9021b5104b0dd601cb6664 /source/gameengine/Rasterizer/RAS_MaterialBucket.cpp
parent9c883a1ecabe387533909b1e3116c2c30418f6e9 (diff)
Revert "Fix T37920: BGE LibLoad failed for meshes with no materials"
This reverts commit 6a473305af22468abfc4c4f8f3002dc0a97fffd7. Caused T38296, need to investigate this further but for now better not leave blender in unstable state.
Diffstat (limited to 'source/gameengine/Rasterizer/RAS_MaterialBucket.cpp')
-rw-r--r--source/gameengine/Rasterizer/RAS_MaterialBucket.cpp16
1 files changed, 1 insertions, 15 deletions
diff --git a/source/gameengine/Rasterizer/RAS_MaterialBucket.cpp b/source/gameengine/Rasterizer/RAS_MaterialBucket.cpp
index b7a5804c069..0c715524218 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::RemoveMeshSlot(RAS_MeshSlot *ms)
+void RAS_MaterialBucket::RemoveMesh(RAS_MeshSlot* ms)
{
list<RAS_MeshSlot>::iterator it;
@@ -570,20 +570,6 @@ void RAS_MaterialBucket::RemoveMeshSlot(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();