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.h
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.h')
-rw-r--r--source/gameengine/Rasterizer/RAS_MaterialBucket.h3
1 files changed, 1 insertions, 2 deletions
diff --git a/source/gameengine/Rasterizer/RAS_MaterialBucket.h b/source/gameengine/Rasterizer/RAS_MaterialBucket.h
index a55bf1d1ba9..007fdf240c4 100644
--- a/source/gameengine/Rasterizer/RAS_MaterialBucket.h
+++ b/source/gameengine/Rasterizer/RAS_MaterialBucket.h
@@ -228,8 +228,7 @@ public:
class RAS_MeshSlot* AddMesh(int numverts);
class RAS_MeshSlot* CopyMesh(class RAS_MeshSlot *ms);
- void RemoveMeshSlot(class RAS_MeshSlot *ms);
- void RemoveMesh(class RAS_MeshObject *mesh);
+ void RemoveMesh(class RAS_MeshSlot* ms);
void Optimize(MT_Scalar distance);
void ActivateMesh(RAS_MeshSlot* slot)
{