[Bf-blender-cvs] [de5589f0ff3] soc-2019-outliner: Revert "Keymap: Simplify outliner select keymap"
Nathan Craddock
noreply at git.blender.org
Fri Jul 12 06:44:55 CEST 2019
Commit: de5589f0ff333574e4b1964da9f5a0ec94609546
Author: Nathan Craddock
Date: Thu Jul 11 22:29:41 2019 -0600
Branches: soc-2019-outliner
https://developer.blender.org/rBde5589f0ff333574e4b1964da9f5a0ec94609546
Revert "Keymap: Simplify outliner select keymap"
This reverts most of commit 210600e7f6df7575ad00ebbe4e4ef40be17677d0.
===================================================================
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 d33ade70fbb..cf27b309f45 100644
--- a/release/scripts/presets/keyconfig/keymap_data/blender_default.py
+++ b/release/scripts/presets/keyconfig/keymap_data/blender_default.py
@@ -698,13 +698,15 @@ 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": [("deselect_all", not params.legacy)]}),
+ {"properties": [("extend", False), ("recursive", False),
+ ("deselect_all", not params.legacy)]}),
("outliner.item_activate", {"type": 'LEFTMOUSE', "value": 'CLICK', "ctrl": True},
- {"properties": [("extend", True), ("deselect_all", not params.legacy)]}),
+ {"properties": [("extend", True), ("recursive", False), ("deselect_all", not params.legacy)]}),
("outliner.item_activate", {"type": 'LEFTMOUSE', "value": 'CLICK', "shift": True},
- {"properties": [("range", True), ("deselect_all", not params.legacy)]}),
+ {"properties": [("extend", False), ("range", True), ("recursive", False),
+ ("deselect_all", not params.legacy)]}),
("outliner.item_activate", {"type": 'LEFTMOUSE', "value": 'CLICK', "alt": True},
- {"properties": [("recursive", True)]}),
+ {"properties": [("extend", False), ("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 6be65b92387..09752bdb08e 100644
--- a/source/blender/editors/space_outliner/outliner_select.c
+++ b/source/blender/editors/space_outliner/outliner_select.c
@@ -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", false, "Extend", "Extend selection for activation");
+ RNA_def_boolean(ot->srna, "extend", true, "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);
More information about the Bf-blender-cvs
mailing list