diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2016-07-08 09:41:22 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2016-07-08 09:52:10 +0300 |
| commit | d5d26338b5a13aaaaefd051efcbbc93c453b57c7 (patch) | |
| tree | 6bd643e67c73ed0d1c25d2d353d851fd7fe97d2b /source/blender/editors/curve/editcurve.c | |
| parent | 83fe139b2b9c37db50c14833cb38877b999db6de (diff) | |
Mesh/Curve Join: remove edit-mode toggle
Toggling edit-node after joining objects is redundant as far as I can see -
(dates back to first revision).
Also caused all edges to be drawn w/ meshes, redundant undo step w/ curves.
Diffstat (limited to 'source/blender/editors/curve/editcurve.c')
| -rw-r--r-- | source/blender/editors/curve/editcurve.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/source/blender/editors/curve/editcurve.c b/source/blender/editors/curve/editcurve.c index 420f72fedb3..d87f8a6d93d 100644 --- a/source/blender/editors/curve/editcurve.c +++ b/source/blender/editors/curve/editcurve.c @@ -6034,9 +6034,8 @@ int join_curve_exec(bContext *C, wmOperator *op) BLI_movelisttolist(&cu->nurb, &tempbase); DAG_relations_tag_update(bmain); // because we removed object(s), call before editmode! - - ED_object_editmode_enter(C, EM_WAITCURSOR); - ED_object_editmode_exit(C, EM_FREEDATA | EM_WAITCURSOR | EM_DO_UNDO); + + DAG_id_tag_update(&ob->id, OB_RECALC_OB | OB_RECALC_DATA); WM_event_add_notifier(C, NC_SCENE | ND_OB_ACTIVE, scene); |