From dd020caa04cfa009a6ff0b6e9b78ff32bdf514ef Mon Sep 17 00:00:00 2001 From: Bastien Montagne Date: Wed, 20 Jul 2016 16:40:43 +0200 Subject: Cleanup: remove completely call to test_object_materials in BKE_mesh_new_from_object. Don't know why this was ever added to start with, BKE_mesh_new_from_object shall never affect ob->data! --- source/blender/blenkernel/intern/mesh.c | 5 ----- 1 file changed, 5 deletions(-) (limited to 'source') diff --git a/source/blender/blenkernel/intern/mesh.c b/source/blender/blenkernel/intern/mesh.c index 0ad3847988e..99b1e96cf20 100644 --- a/source/blender/blenkernel/intern/mesh.c +++ b/source/blender/blenkernel/intern/mesh.c @@ -2441,11 +2441,6 @@ Mesh *BKE_mesh_new_from_object( BKE_mesh_tessface_ensure(tmpmesh); } - /* make sure materials get updated in object */ - if (ob->data == tmpmesh) { /* XXX To be removed, there is no reason that ob->data would be new tmpmesh... */ - test_object_materials(ob, &tmpmesh->id); - } - return tmpmesh; } -- cgit v1.2.3