diff options
author | Campbell Barton <ideasman42@gmail.com> | 2021-01-22 04:42:20 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2021-01-22 04:42:20 +0300 |
commit | 4f3fba2aa78ee1bd97963630e7c17b0d22cc7c35 (patch) | |
tree | 9b5403b6a6b1472afbd60b44c15f8d1da9171474 /source/blender/editors/space_outliner | |
parent | 665eca85baaee380c067b375d22647d3c6c95a0e (diff) | |
parent | 7b528b2a3ad33b3ad7328213669d8179528e254b (diff) |
Merge branch 'blender-v2.92-release'
Diffstat (limited to 'source/blender/editors/space_outliner')
-rw-r--r-- | source/blender/editors/space_outliner/outliner_select.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/source/blender/editors/space_outliner/outliner_select.c b/source/blender/editors/space_outliner/outliner_select.c index 6125f40c022..1ef5735d7d2 100644 --- a/source/blender/editors/space_outliner/outliner_select.c +++ b/source/blender/editors/space_outliner/outliner_select.c @@ -398,14 +398,10 @@ static eOLDrawState tree_element_set_active_object(bContext *C, } if (set != OL_SETSEL_NONE) { - ED_object_base_activate(C, base); /* adds notifier */ + ED_object_base_activate_with_mode_exit_if_needed(C, base); /* adds notifier */ DEG_id_tag_update(&scene->id, ID_RECALC_SELECT); WM_event_add_notifier(C, NC_SCENE | ND_OB_SELECT, scene); } - - if (ob != OBEDIT_FROM_VIEW_LAYER(view_layer)) { - ED_object_editmode_exit(C, EM_FREEDATA); - } } return OL_DRAWSEL_NORMAL; } |