[Bf-blender-cvs] [210600e7f6d] soc-2019-outliner: Keymap: Simplify outliner select keymap

[Nathan Craddock]

Commit: 210600e7f6df7575ad00ebbe4e4ef40be17677d0
Author: Nathan Craddock
Date:   Thu Jul 11 16:16:16 2019 -0600
Branches: soc-2019-outliner
https://developer.blender.org/rB210600e7f6df7575ad00ebbe4e4ef40be17677d0

Keymap: Simplify outliner select keymap

Changed extend default and simplified the keymap

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

M	release/scripts/presets/keyconfig/keymap_data/blender_default.py
M	source/blender/editors/space_outliner/outliner_select.c

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

diff --git a/release/scripts/presets/keyconfig/keymap_data/blender_default.py b/release/scripts/presets/keyconfig/keymap_data/blender_default.py
index 00b1e5720a2..d33ade70fbb 100644
--- a/release/scripts/presets/keyconfig/keymap_data/blender_default.py
+++ b/release/scripts/presets/keyconfig/keymap_data/blender_default.py
@@ -698,14 +698,13 @@ def km_outliner(params):
         ("outliner.highlight_update", {"type": 'MOUSEMOVE', "value": 'ANY', "any": True}, None),
         ("outliner.item_rename", {"type": 'LEFTMOUSE', "value": 'DOUBLE_CLICK'}, None),
         ("outliner.item_activate", {"type": 'LEFTMOUSE', "value": 'CLICK'},
-         {"properties": [("extend", False), ("recursive", False),
-         ("deselect_all", not params.legacy)]}),
+         {"properties": [("deselect_all", not params.legacy)]}),
         ("outliner.item_activate", {"type": 'LEFTMOUSE', "value": 'CLICK', "ctrl": True},
-         {"properties": [("extend", True), ("recursive", False)]}),
+         {"properties": [("extend", True), ("deselect_all", not params.legacy)]}),
         ("outliner.item_activate", {"type": 'LEFTMOUSE', "value": 'CLICK', "shift": True},
-         {"properties": [("extend", False), ("range", True), ("recursive", False)]}),
+         {"properties": [("range", True), ("deselect_all", not params.legacy)]}),
         ("outliner.item_activate", {"type": 'LEFTMOUSE', "value": 'CLICK', "alt": True},
-         {"properties": [("extend", False), ("recursive", True)]}),
+         {"properties": [("recursive", True)]}),
         ("outliner.item_activate", {"type": 'LEFTMOUSE', "value": 'CLICK', "ctrl": True, "alt": True},
          {"properties": [("extend", True), ("recursive", True)]}),
         ("outliner.select_box", {"type": 'B', "value": 'PRESS'}, None),
diff --git a/source/blender/editors/space_outliner/outliner_select.c b/source/blender/editors/space_outliner/outliner_select.c
index 269883ded5a..6be65b92387 100644
--- a/source/blender/editors/space_outliner/outliner_select.c
+++ b/source/blender/editors/space_outliner/outliner_select.c
@@ -277,8 +277,8 @@ static eOLDrawState active_viewlayer(bContext *C,
 
 /**
  * Select object tree:
- * CTRL+LMB: Select/Deselect object and all children.
- * CTRL+SHIFT+LMB: Add/Remove object and all children.
+ * ALT+LMB: Select/Deselect object and all children.
+ * CTRL+ALT+LMB: Add/Remove object and all children.
  */
 static void do_outliner_object_select_recursive(ViewLayer *view_layer,
                                                 Object *ob_parent,
@@ -1455,7 +1455,7 @@ void OUTLINER_OT_item_activate(wmOperatorType *ot)
   ot->poll = ED_operator_outliner_active;
 
   PropertyRNA *prop;
-  RNA_def_boolean(ot->srna, "extend", true, "Extend", "Extend selection for activation");
+  RNA_def_boolean(ot->srna, "extend", false, "Extend", "Extend selection for activation");
   prop = RNA_def_boolean(ot->srna, "range", false, "Range", "Select a range from active element");
   RNA_def_property_flag(prop, PROP_SKIP_SAVE);