diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2018-03-01 14:36:40 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2018-03-01 14:46:25 +0300 |
| commit | f242f3e75bbc4132f36eadf9fe552280a164a7b6 (patch) | |
| tree | a37026c0c5d13d91d4a3ed1246554987fffdf908 /source/blender/editors/object | |
| parent | 865fdd61df0eb90c4f712430fb8dbc0d37087448 (diff) | |
Fix assert on exit edit-mode
Diffstat (limited to 'source/blender/editors/object')
| -rw-r--r-- | source/blender/editors/object/object_edit.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/editors/object/object_edit.c b/source/blender/editors/object/object_edit.c index 320aadf2249..ec81cdfdf69 100644 --- a/source/blender/editors/object/object_edit.c +++ b/source/blender/editors/object/object_edit.c @@ -299,6 +299,8 @@ void ED_object_editmode_exit_ex(bContext *C, WorkSpace *workspace, Scene *scene, /* also flush ob recalc, doesn't take much overhead, but used for particles */ DEG_id_tag_update(&obedit->id, OB_RECALC_OB | OB_RECALC_DATA); + + workspace->object_mode &= ~OB_MODE_EDIT; if (flag & EM_DO_UNDO) ED_undo_push(C, "Editmode"); @@ -309,8 +311,6 @@ void ED_object_editmode_exit_ex(bContext *C, WorkSpace *workspace, Scene *scene, else { WM_main_add_notifier(NC_SCENE | ND_MODE | NS_MODE_OBJECT, scene); } - - workspace->object_mode &= ~OB_MODE_EDIT; } ED_workspace_object_mode_sync_from_object(G.main->wm.first, workspace, obedit); |