[Bf-blender-cvs] [53c61d2a4c4] soc-2020-outliner: Outliner: Remove mode toggling on selection

[Nathan Craddock]

Commit: 53c61d2a4c403763b9edb012106ea4d863e52ff8
Author: Nathan Craddock
Date:   Thu Jun 11 11:20:35 2020 -0600
Branches: soc-2020-outliner
https://developer.blender.org/rB53c61d2a4c403763b9edb012106ea4d863e52ff8

Outliner: Remove mode toggling on selection

Mode toggle was tied to selection. This is the final commit removing
that logic from the OUTLINER_OT_item_activate function.

===================================================================

M	source/blender/editors/space_outliner/outliner_intern.h
M	source/blender/editors/space_outliner/outliner_select.c

===================================================================

diff --git a/source/blender/editors/space_outliner/outliner_intern.h b/source/blender/editors/space_outliner/outliner_intern.h
index 232e670257f..e551fbdd5b5 100644
--- a/source/blender/editors/space_outliner/outliner_intern.h
+++ b/source/blender/editors/space_outliner/outliner_intern.h
@@ -223,7 +223,6 @@ typedef enum TreeItemSelect {
   OL_ITEM_ACTIVATE = (1 << 2),    /* Activate the item */
   OL_ITEM_EXTEND = (1 << 3),      /* Extend the current selection */
   OL_ITEM_RECURSIVE = (1 << 4),   /* Select recursively */
-  OL_ITEM_TOGGLE_MODE = (1 << 5)  /* Temporary */
 } TreeItemSelect;
 
 /* outliner_tree.c ----------------------------------------------- */
diff --git a/source/blender/editors/space_outliner/outliner_select.c b/source/blender/editors/space_outliner/outliner_select.c
index 2107c5e1d75..e0d48335068 100644
--- a/source/blender/editors/space_outliner/outliner_select.c
+++ b/source/blender/editors/space_outliner/outliner_select.c
@@ -1339,11 +1339,6 @@ void outliner_item_select(bContext *C,
                                            extend,
                                            select_flag & OL_ITEM_RECURSIVE,
                                            activate_data || soops->flag & SO_SYNC_SELECT);
-
-    /* Mode toggle on data activate for now, but move later */
-    if (select_flag & OL_ITEM_TOGGLE_MODE) {
-      /* outliner_item_mode_toggle(C, &tvc, te, extend); */
-    }
   }
 }
 
@@ -1483,7 +1478,7 @@ static int outliner_item_do_activate_from_cursor(bContext *C,
 
       const short select_flag = OL_ITEM_ACTIVATE | (select ? OL_ITEM_SELECT : OL_ITEM_DESELECT) |
                                 (is_over_name_icons ? OL_ITEM_SELECT_DATA : 0) |
-                                (extend ? OL_ITEM_EXTEND : 0) | OL_ITEM_TOGGLE_MODE;
+                                (extend ? OL_ITEM_EXTEND : 0);
 
       outliner_item_select(C, soops, activate_te, select_flag);
     }