diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2017-03-17 02:10:55 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2017-03-17 02:10:55 +0300 |
| commit | b27e2242768ca39bd832e95a385d3e4ad802059e (patch) | |
| tree | 0db202b34779472dea0b8f1e77063bf80aed01d3 /source/blender/editors/object/object_add.c | |
| parent | 750c0dd4debce8c79c3875fe54f1a1d57cf047da (diff) | |
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.
Diffstat (limited to 'source/blender/editors/object/object_add.c')
| -rw-r--r-- | source/blender/editors/object/object_add.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/source/blender/editors/object/object_add.c b/source/blender/editors/object/object_add.c index c9c3fe981bc..20523264cd9 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); |