[Bf-blender-cvs] [dd020ca] master: Cleanup: remove completely call to test_object_materials in BKE_mesh_new_from_object.

Bastien Montagne noreply at git.blender.org
Wed Jul 20 16:44:44 CEST 2016


Commit: dd020caa04cfa009a6ff0b6e9b78ff32bdf514ef
Author: Bastien Montagne
Date:   Wed Jul 20 16:40:43 2016 +0200
Branches: master
https://developer.blender.org/rBdd020caa04cfa009a6ff0b6e9b78ff32bdf514ef

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!

===================================================================

M	source/blender/blenkernel/intern/mesh.c

===================================================================

diff --git a/source/blender/blenkernel/intern/mesh.c b/source/blender/blenkernel/intern/mesh.c
index 0ad3847..99b1e96 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;
 }




More information about the Bf-blender-cvs mailing list