[Bf-blender-cvs] [4c5ff244fd1] temp-graph-select-changes: Change keymaps to use box select Include Handles by default
Julian Eisel
noreply at git.blender.org
Tue Nov 12 15:11:04 CET 2019
Commit: 4c5ff244fd1bd521d26e9ad6710f501d758dc839
Author: Julian Eisel
Date: Tue Nov 12 14:32:55 2019 +0100
Branches: temp-graph-select-changes
https://developer.blender.org/rB4c5ff244fd1bd521d26e9ad6710f501d758dc839
Change keymaps to use box select Include Handles by default
Also removes Ctrl+B and Ctrl+Alt+B (Ctrl+Q and Ctrl+Alt+Q in the
industry compatible keymap) which are now redundant in the keymap: they
used to toggle the Include Handlers option only.
We could instead use them to disable Include Handles, but lets first see
if there's much desire for it.
===================================================================
M release/scripts/presets/keyconfig/keymap_data/blender_default.py
M release/scripts/presets/keyconfig/keymap_data/industry_compatible_data.py
M source/blender/editors/space_graph/graph_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 cb918902533..6e9cd211bed 100644
--- a/release/scripts/presets/keyconfig/keymap_data/blender_default.py
+++ b/release/scripts/presets/keyconfig/keymap_data/blender_default.py
@@ -1411,19 +1411,15 @@ def km_graph_editor(params):
{"properties": [("mode", 'RIGHT'), ("extend", False)]}),
*_template_items_select_actions(params, "graph.select_all"),
("graph.select_box", {"type": 'B', "value": 'PRESS'},
- {"properties": [("axis_range", False), ("include_handles", False)]}),
+ {"properties": [("axis_range", False)]}),
("graph.select_box", {"type": 'B', "value": 'PRESS', "alt": True},
- {"properties": [("axis_range", True), ("include_handles", False)]}),
- ("graph.select_box", {"type": 'B', "value": 'PRESS', "ctrl": True},
- {"properties": [("axis_range", False), ("include_handles", True)]}),
- ("graph.select_box", {"type": 'B', "value": 'PRESS', "ctrl": True, "alt": True},
- {"properties": [("axis_range", True), ("include_handles", True)]}),
+ {"properties": [("axis_range", True)]}),
("graph.select_box", {"type": params.select_tweak, "value": 'ANY'},
- {"properties": [("tweak", True), ("mode", 'SET'), ("include_handles", False)]}),
+ {"properties": [("tweak", True), ("mode", 'SET')]}),
("graph.select_box", {"type": params.select_tweak, "value": 'ANY', "shift": True},
- {"properties": [("tweak", True), ("mode", 'ADD'), ("include_handles", False)]}),
+ {"properties": [("tweak", True), ("mode", 'ADD')]}),
("graph.select_box", {"type": params.select_tweak, "value": 'ANY', "ctrl": True},
- {"properties": [("tweak", True), ("mode", 'SUB'), ("include_handles", True)]}),
+ {"properties": [("tweak", True), ("mode", 'SUB')]}),
("graph.select_lasso", {"type": params.action_tweak, "value": 'ANY', "ctrl": True},
{"properties": [("mode", 'ADD')]}),
("graph.select_lasso", {"type": params.action_tweak, "value": 'ANY', "shift": True, "ctrl": True},
diff --git a/release/scripts/presets/keyconfig/keymap_data/industry_compatible_data.py b/release/scripts/presets/keyconfig/keymap_data/industry_compatible_data.py
index 49a394b478d..aec9368ae66 100644
--- a/release/scripts/presets/keyconfig/keymap_data/industry_compatible_data.py
+++ b/release/scripts/presets/keyconfig/keymap_data/industry_compatible_data.py
@@ -860,19 +860,15 @@ def km_graph_editor(params):
("graph.select_all", {"type": 'A', "value": 'PRESS', "ctrl": True, "shift": True}, {"properties": [("action", 'DESELECT')]}),
("graph.select_all", {"type": 'I', "value": 'PRESS', "ctrl": True}, {"properties": [("action", 'INVERT')]}),
("graph.select_box", {"type": 'Q', "value": 'PRESS'},
- {"properties": [("axis_range", False), ("include_handles", False)]}),
+ {"properties": [("axis_range", False)]}),
("graph.select_box", {"type": 'Q', "value": 'PRESS', "alt": True},
- {"properties": [("axis_range", True), ("include_handles", False)]}),
- ("graph.select_box", {"type": 'Q', "value": 'PRESS', "ctrl": True},
- {"properties": [("axis_range", False), ("include_handles", True)]}),
- ("graph.select_box", {"type": 'Q', "value": 'PRESS', "ctrl": True, "alt": True},
- {"properties": [("axis_range", True), ("include_handles", True)]}),
+ {"properties": [("axis_range", True)]}),
("graph.select_box", {"type": 'EVT_TWEAK_L', "value": 'ANY'},
- {"properties":[("tweak", True), ("axis_range", False), ("include_handles", False), ("mode", 'SET')]}),
+ {"properties":[("tweak", True), ("axis_range", False), ("mode", 'SET')]}),
("graph.select_box", {"type": 'EVT_TWEAK_L', "value": 'ANY', "shift": True},
- {"properties":[("tweak", True), ("axis_range", False), ("include_handles", False), ("mode", 'ADD')]}),
+ {"properties":[("tweak", True), ("axis_range", False), ("mode", 'ADD')]}),
("graph.select_box", {"type": 'EVT_TWEAK_L', "value": 'ANY', "ctrl": True},
- {"properties":[("tweak", True), ("axis_range", False),("include_handles", False), ("mode", 'SUB')]}),
+ {"properties":[("tweak", True), ("axis_range", False), ("mode", 'SUB')]}),
("graph.select_more", {"type": 'UP_ARROW', "value": 'PRESS'}, None),
("graph.select_less", {"type": 'DOWN_ARROW', "value": 'PRESS'}, None),
("graph.select_linked", {"type": 'RIGHT_BRACKET', "value": 'PRESS'}, None),
diff --git a/source/blender/editors/space_graph/graph_select.c b/source/blender/editors/space_graph/graph_select.c
index 4e335bdac74..b03c9024b69 100644
--- a/source/blender/editors/space_graph/graph_select.c
+++ b/source/blender/editors/space_graph/graph_select.c
@@ -726,7 +726,7 @@ void GRAPH_OT_select_box(wmOperatorType *ot)
ot->prop = RNA_def_boolean(ot->srna, "axis_range", 0, "Axis Range", "");
RNA_def_boolean(ot->srna,
"include_handles",
- 0,
+ true,
"Include Handles",
"Are handles tested individually against the selection criteria");
More information about the Bf-blender-cvs
mailing list