[Bf-blender-cvs] [45fdbab] alembic_basic_io: Avoid calling BKE_object_material_slot_remove.
Kévin Dietrich
noreply at git.blender.org
Thu Jul 21 00:33:42 CEST 2016
Commit: 45fdbabb265cf5a6dbfa6dfdbfd3b936c682383b
Author: Kévin Dietrich
Date: Thu Jul 21 00:00:11 2016 +0200
Branches: alembic_basic_io
https://developer.blender.org/rB45fdbabb265cf5a6dbfa6dfdbfd3b936c682383b
Avoid calling BKE_object_material_slot_remove.
===================================================================
M source/blender/alembic/intern/abc_mesh.cc
===================================================================
diff --git a/source/blender/alembic/intern/abc_mesh.cc b/source/blender/alembic/intern/abc_mesh.cc
index f121cf4..307b5c0 100644
--- a/source/blender/alembic/intern/abc_mesh.cc
+++ b/source/blender/alembic/intern/abc_mesh.cc
@@ -739,9 +739,6 @@ static Material *find_material(Main *bmain, const char *name)
static void assign_materials(Main *bmain, Object *ob, const std::map<std::string, int> &mat_map)
{
- /* Clean up slots. */
- while (BKE_object_material_slot_remove(ob));
-
bool can_assign = true;
std::map<std::string, int>::const_iterator it = mat_map.begin();
More information about the Bf-blender-cvs
mailing list