diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2018-04-10 21:17:56 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2018-04-10 21:17:56 +0300 |
| commit | 1b78f05b1ca466695b39d4fd60570790c1ab9e13 (patch) | |
| tree | 4c5bff1f5c6da02e87e3eb193190e4a7e5f49e8e /source/blender/editors/object | |
| parent | d7aa51a50c65d06108a7979265226d1746d89da1 (diff) | |
| parent | f55adabb3e5d3a75ecdb30f90487e314f0afb753 (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/editors/object')
| -rw-r--r-- | source/blender/editors/object/object_add.c | 2 | ||||
| -rw-r--r-- | source/blender/editors/object/object_edit.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/editors/object/object_add.c b/source/blender/editors/object/object_add.c index bfeb48f9308..4334a80cd39 100644 --- a/source/blender/editors/object/object_add.c +++ b/source/blender/editors/object/object_add.c @@ -432,7 +432,7 @@ Object *ED_object_add_type( /* for as long scene has editmode... */ if (CTX_data_edit_object(C)) - ED_object_editmode_exit(C, EM_FREEDATA | EM_FREEUNDO | EM_WAITCURSOR | EM_DO_UNDO); /* freedata, and undo */ + ED_object_editmode_exit(C, EM_FREEDATA | EM_WAITCURSOR | EM_DO_UNDO); /* freedata, and undo */ /* deselects all, sets scene->basact */ ob = BKE_object_add(bmain, scene, view_layer, type, name); diff --git a/source/blender/editors/object/object_edit.c b/source/blender/editors/object/object_edit.c index 9306213581e..bfe0194fe42 100644 --- a/source/blender/editors/object/object_edit.c +++ b/source/blender/editors/object/object_edit.c @@ -466,7 +466,7 @@ static int editmode_toggle_exec(bContext *C, wmOperator *op) if (!is_mode_set) ED_object_editmode_enter(C, EM_WAITCURSOR); else - ED_object_editmode_exit(C, EM_FREEDATA | EM_FREEUNDO | EM_WAITCURSOR); /* had EM_DO_UNDO but op flag calls undo too [#24685] */ + ED_object_editmode_exit(C, EM_FREEDATA | EM_WAITCURSOR); /* had EM_DO_UNDO but op flag calls undo too [#24685] */ ED_space_image_uv_sculpt_update(CTX_wm_manager(C), scene); |