[Bf-blender-cvs] [b27e224276] master: Mesh Convert: remove meaningless modifier check
Campbell Barton
noreply at git.blender.org
Fri Mar 17 00:08:51 CET 2017
Commit: b27e2242768ca39bd832e95a385d3e4ad802059e
Author: Campbell Barton
Date: Fri Mar 17 10:10:55 2017 +1100
Branches: master
https://developer.blender.org/rBb27e2242768ca39bd832e95a385d3e4ad802059e
Mesh Convert: remove meaningless modifier check
Meshes w/o modifiers wouldn't have their derived mesh applied.
Check was to avoid crash but its in fact meaningless,
since the modifier might be disabled, or there may be virtual modifiers.
===================================================================
M source/blender/editors/object/object_add.c
===================================================================
diff --git a/source/blender/editors/object/object_add.c b/source/blender/editors/object/object_add.c
index c9c3fe981b..20523264cd 100644
--- a/source/blender/editors/object/object_add.c
+++ b/source/blender/editors/object/object_add.c
@@ -1717,7 +1717,7 @@ static int convert_exec(bContext *C, wmOperator *op)
ED_rigidbody_object_remove(bmain, scene, newob);
}
}
- else if (ob->type == OB_MESH && ob->modifiers.first) { /* converting a mesh with no modifiers causes a segfault */
+ else if (ob->type == OB_MESH) {
ob->flag |= OB_DONE;
if (keep_original) {
@@ -1741,7 +1741,6 @@ static int convert_exec(bContext *C, wmOperator *op)
* cases this doesnt give correct results (when MDEF is used for eg)
*/
dm = mesh_get_derived_final(scene, newob, CD_MASK_MESH);
- // dm = mesh_create_derived_no_deform(ob1, NULL); /* this was called original (instead of get_derived). man o man why! (ton) */
DM_to_mesh(dm, newob->data, newob, CD_MASK_MESH, true);
More information about the Bf-blender-cvs
mailing list