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:
authorBastien Montagne <montagne29@wanadoo.fr>2016-07-20 17:40:43 +0300
committerBastien Montagne <montagne29@wanadoo.fr>2016-07-20 17:42:09 +0300
commitdd020caa04cfa009a6ff0b6e9b78ff32bdf514ef (patch)
tree5a778e0c46a6de2552a310e090ae961920e67e94 /source/blender/blenkernel/intern/mesh.c
parent1270ab91be53fd90e404e6366c73cc99ba470b14 (diff)
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!
Diffstat (limited to 'source/blender/blenkernel/intern/mesh.c')
-rw-r--r--source/blender/blenkernel/intern/mesh.c5
1 files changed, 0 insertions, 5 deletions
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;
}