diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2018-05-30 08:34:22 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2018-05-30 08:34:22 +0300 |
| commit | 0e0502cbdf9d13a72c96a645c5d886210118ab50 (patch) | |
| tree | 131565c592cd5711db168d86b41797d73998e893 /source/blender/editors | |
| parent | 9992079d597f20c49f6f223d45a895019bb71434 (diff) | |
| parent | 2c03d6a12be29b020dfdd483462322e4dd8f8d98 (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/editors')
| -rw-r--r-- | source/blender/editors/space_outliner/outliner_select.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/editors/space_outliner/outliner_select.c b/source/blender/editors/space_outliner/outliner_select.c index 42fe70be527..2f88cb4469f 100644 --- a/source/blender/editors/space_outliner/outliner_select.c +++ b/source/blender/editors/space_outliner/outliner_select.c @@ -872,7 +872,7 @@ static void do_outliner_item_activate_tree_element( WM_event_add_notifier(C, NC_SCENE | ND_OB_SELECT, scene); } - else if (ELEM(te->idcode, ID_ME, ID_CU, ID_MB, ID_LT, ID_AR)) { + else if (OB_DATA_SUPPORT_EDITMODE(te->idcode)) { WM_operator_name_call(C, "OBJECT_OT_editmode_toggle", WM_OP_INVOKE_REGION_WIN, NULL); } else { // rest of types |