diff options
| author | Bastien Montagne <montagne29@wanadoo.fr> | 2018-04-04 16:03:55 +0300 |
|---|---|---|
| committer | Bastien Montagne <montagne29@wanadoo.fr> | 2018-04-04 16:03:55 +0300 |
| commit | 160e62b88cdcc927b7cb3741c7ea0565412e8016 (patch) | |
| tree | 3561447e02e088a056f85f10d13094a7fb49b9ca /source/blender/editors/object | |
| parent | 59562e5b259ccc1e02e4f943394ca9db5ac938c7 (diff) | |
| parent | d59c2d12b1226afa3789b0ef142f8f6cc9356ead (diff) | |
Merge branch 'master' into blender2.8
Conflicts:
source/blender/blenkernel/BKE_object.h
Diffstat (limited to 'source/blender/editors/object')
| -rw-r--r-- | source/blender/editors/object/object_add.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/source/blender/editors/object/object_add.c b/source/blender/editors/object/object_add.c index 3590b38310f..96a5a95a5cd 100644 --- a/source/blender/editors/object/object_add.c +++ b/source/blender/editors/object/object_add.c @@ -1659,7 +1659,7 @@ static void curvetomesh(EvaluationContext *eval_ctx, Main *bmain, Scene *scene, BKE_mesh_from_nurbs(ob); /* also does users */ if (ob->type == OB_MESH) { - BKE_object_free_modifiers(ob); + BKE_object_free_modifiers(ob, 0); /* Game engine defaults for mesh objects */ ob->body_type = OB_BODY_TYPE_STATIC; @@ -1788,7 +1788,7 @@ static int convert_exec(bContext *C, wmOperator *op) /* When 2 objects with linked data are selected, converting both * would keep modifiers on all but the converted object [#26003] */ if (ob->type == OB_MESH) { - BKE_object_free_modifiers(ob); /* after derivedmesh calls! */ + BKE_object_free_modifiers(ob, 0); /* after derivedmesh calls! */ } } } @@ -1813,7 +1813,7 @@ static int convert_exec(bContext *C, wmOperator *op) BKE_mesh_to_curve(&eval_ctx, scene, newob); if (newob->type == OB_CURVE) { - BKE_object_free_modifiers(newob); /* after derivedmesh calls! */ + BKE_object_free_modifiers(newob, 0); /* after derivedmesh calls! */ ED_rigidbody_object_remove(bmain, scene, newob); } } @@ -1846,7 +1846,7 @@ static int convert_exec(bContext *C, wmOperator *op) /* re-tessellation is called by DM_to_mesh */ - BKE_object_free_modifiers(newob); /* after derivedmesh calls! */ + BKE_object_free_modifiers(newob, 0); /* after derivedmesh calls! */ } else if (ob->type == OB_FONT) { ob->flag |= OB_DONE; |