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/space_outliner/outliner_select.c | |
| parent | d7aa51a50c65d06108a7979265226d1746d89da1 (diff) | |
| parent | f55adabb3e5d3a75ecdb30f90487e314f0afb753 (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/editors/space_outliner/outliner_select.c')
| -rw-r--r-- | source/blender/editors/space_outliner/outliner_select.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/editors/space_outliner/outliner_select.c b/source/blender/editors/space_outliner/outliner_select.c index bfa8633ab7d..6626eeb19f4 100644 --- a/source/blender/editors/space_outliner/outliner_select.c +++ b/source/blender/editors/space_outliner/outliner_select.c @@ -195,7 +195,7 @@ static eOLDrawState tree_element_set_active_object( } if (ob != OBEDIT_FROM_VIEW_LAYER(view_layer)) - ED_object_editmode_exit(C, EM_FREEDATA | EM_FREEUNDO | EM_WAITCURSOR | EM_DO_UNDO); + ED_object_editmode_exit(C, EM_FREEDATA | EM_WAITCURSOR | EM_DO_UNDO); return OL_DRAWSEL_NORMAL; } @@ -668,7 +668,7 @@ static eOLDrawState tree_element_active_pose( if (set != OL_SETSEL_NONE) { if (OBEDIT_FROM_VIEW_LAYER(view_layer)) - ED_object_editmode_exit(C, EM_FREEDATA | EM_FREEUNDO | EM_WAITCURSOR | EM_DO_UNDO); + ED_object_editmode_exit(C, EM_FREEDATA | EM_WAITCURSOR | EM_DO_UNDO); if (ob->mode & OB_MODE_POSE) ED_armature_exit_posemode(C, base); |