[Bf-blender-cvs] [caaf5f0a09] master: Fix T50757: Alembic, assign imported materials to the object data instead of to the object itself.
Kévin Dietrich
noreply at git.blender.org
Fri Feb 24 21:19:59 CET 2017
Commit: caaf5f0a09d3f05648068161034756c756052b25
Author: Kévin Dietrich
Date: Fri Feb 24 21:19:52 2017 +0100
Branches: master
https://developer.blender.org/rBcaaf5f0a09d3f05648068161034756c756052b25
Fix T50757: Alembic, assign imported materials to the object data
instead of to the object itself.
===================================================================
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 8bc9c33505..5a57e43326 100644
--- a/source/blender/alembic/intern/abc_mesh.cc
+++ b/source/blender/alembic/intern/abc_mesh.cc
@@ -691,7 +691,7 @@ static void assign_materials(Main *bmain, Object *ob, const std::map<std::string
assigned_name = mat_iter->second;
}
- assign_material(ob, assigned_name, it->second, BKE_MAT_ASSIGN_OBJECT);
+ assign_material(ob, assigned_name, it->second, BKE_MAT_ASSIGN_OBDATA);
}
}
}
More information about the Bf-blender-cvs
mailing list