diff options
author | Campbell Barton <ideasman42@gmail.com> | 2014-01-22 17:49:58 +0400 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2014-01-22 17:50:01 +0400 |
commit | 51c32ac1996f3e6794b1fe29d4e03b10360f9455 (patch) | |
tree | 797273ebd87fe0824c9021b5104b0dd601cb6664 /source/gameengine/Rasterizer/RAS_MeshObject.cpp | |
parent | 9c883a1ecabe387533909b1e3116c2c30418f6e9 (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_MeshObject.cpp')
-rw-r--r-- | source/gameengine/Rasterizer/RAS_MeshObject.cpp | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/source/gameengine/Rasterizer/RAS_MeshObject.cpp b/source/gameengine/Rasterizer/RAS_MeshObject.cpp index fb13596890f..ff909b5955f 100644 --- a/source/gameengine/Rasterizer/RAS_MeshObject.cpp +++ b/source/gameengine/Rasterizer/RAS_MeshObject.cpp @@ -458,14 +458,9 @@ void RAS_MeshObject::RemoveFromBuckets(void *clientobj) if (!msp) continue; - /* see [#37920] */ -#if 0 RAS_MeshSlot *ms = *msp; - it->m_bucket->RemoveMeshSlot(ms); -#else - it->m_bucket->RemoveMesh(this); -#endif + it->m_bucket->RemoveMesh(ms); it->m_slots.remove(clientobj); } } |