Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWilliam Reynish <billrey@me.com>2019-05-08 14:11:04 +0300
committerWilliam Reynish <billrey@me.com>2019-05-08 14:11:04 +0300
commitebf924e0b79b6ebea4401d0b0f2e59e2c103a66d (patch)
tree3e6ed0dc9e8ea4a7a82459210674ade93ec2885e /release
parent0d43d0bcab9aa91fd22971fdb98de94aad0a9e77 (diff)
Keymap: Drag in empty area to box select in animation editors
This is a patch for the default keymap in Blender. It relates to the Dopesheet, Timeline, Graph Editor, NLA and Sequencer Currently, in these editors, dragging outside of your selections does nothing. This patch makes it so dragging outside the selection does a box select operation. It is consistent with how the Node Editor works, as well as the 3D View, if you use the gizmo overlays. Differential Revision: https://developer.blender.org/D4799 Reviewers: campbellbarton
Diffstat (limited to 'release')
-rw-r--r--release/scripts/presets/keyconfig/keymap_data/blender_default.py44
1 files changed, 34 insertions, 10 deletions
diff --git a/release/scripts/presets/keyconfig/keymap_data/blender_default.py b/release/scripts/presets/keyconfig/keymap_data/blender_default.py
index 8661743a203..793f1c76492 100644
--- a/release/scripts/presets/keyconfig/keymap_data/blender_default.py
+++ b/release/scripts/presets/keyconfig/keymap_data/blender_default.py
@@ -1365,7 +1365,7 @@ def km_graph_editor(params):
("column", False), ("curves", False)]}),
("graph.clickselect", {"type": params.select_mouse, "value": 'PRESS', "alt": True},
{"properties": [("extend", False), ("column", True), ("curves", False)]}),
- ("graph.clickselect", {"type": params.select_mouse, "value": 'PRESS', "shift": True},
+ ("graph.clickselect", {"type": params.select_mouse, "value": 'CLICK', "shift": True},
{"properties": [("extend", True), ("column", False), ("curves", False)]}),
("graph.clickselect", {"type": params.select_mouse, "value": 'PRESS', "shift": True, "alt": True},
{"properties": [("extend", True), ("column", True), ("curves", False)]}),
@@ -1373,7 +1373,7 @@ def km_graph_editor(params):
{"properties": [("extend", False), ("column", False), ("curves", True)]}),
("graph.clickselect", {"type": params.select_mouse, "value": 'PRESS', "shift": True, "ctrl": True, "alt": True},
{"properties": [("extend", True), ("column", False), ("curves", True)]}),
- ("graph.select_leftright", {"type": params.select_mouse, "value": 'PRESS', "ctrl": True},
+ ("graph.select_leftright", {"type": params.select_mouse, "value": 'CLICK', "ctrl": True},
{"properties": [("mode", 'CHECK'), ("extend", False)]}),
("graph.select_leftright", {"type": params.select_mouse, "value": 'PRESS', "shift": True, "ctrl": True},
{"properties": [("mode", 'CHECK'), ("extend", True)]}),
@@ -1390,6 +1390,12 @@ def km_graph_editor(params):
{"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)]}),
+ ("graph.select_box", {"type": params.select_tweak, "value": 'ANY'},
+ {"properties":[("axis_range", False), ("include_handles", False), ("wait_for_input", False), ("mode", 'SET')]}),
+ ("graph.select_box", {"type": params.select_tweak, "value": 'ANY', "shift": True},
+ {"properties":[("axis_range", False), ("include_handles", False), ("wait_for_input", False), ("mode", 'ADD')]}),
+ ("graph.select_box", {"type": params.select_tweak, "value": 'ANY', "ctrl": True},
+ {"properties":[("axis_range", False),("include_handles", False), ("wait_for_input", False), ("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},
@@ -1437,7 +1443,7 @@ def km_graph_editor(params):
{"properties": [("only_active", False)]}),
("anim.channels_editable_toggle", {"type": 'TAB', "value": 'PRESS'}, None),
("transform.translate", {"type": 'G', "value": 'PRESS'}, None),
- ("transform.translate", {"type": params.select_tweak, "value": 'ANY'}, None),
+ ("transform.translate", {"type": params.select_mouse, "value": 'PRESS'}, None),
("transform.transform", {"type": 'E', "value": 'PRESS'},
{"properties": [("mode", 'TIME_EXTEND')]}),
("transform.rotate", {"type": 'R', "value": 'PRESS'}, None),
@@ -1914,7 +1920,7 @@ def km_dopesheet(params):
("column", False), ("channel", False)]}),
("action.clickselect", {"type": params.select_mouse, "value": 'PRESS', "alt": True},
{"properties": [("extend", False), ("column", True), ("channel", False)]}),
- ("action.clickselect", {"type": params.select_mouse, "value": 'PRESS', "shift": True},
+ ("action.clickselect", {"type": params.select_mouse, "value": 'CLICK', "shift": True},
{"properties": [("extend", True), ("column", False), ("channel", False)]}),
("action.clickselect", {"type": params.select_mouse, "value": 'PRESS', "shift": True, "alt": True},
{"properties": [("extend", True), ("column", True), ("channel", False)]}),
@@ -1922,7 +1928,7 @@ def km_dopesheet(params):
{"properties": [("extend", False), ("column", False), ("channel", True)]}),
("action.clickselect", {"type": params.select_mouse, "value": 'PRESS', "shift": True, "ctrl": True, "alt": True},
{"properties": [("extend", True), ("column", False), ("channel", True)]}),
- ("action.select_leftright", {"type": params.select_mouse, "value": 'PRESS', "ctrl": True},
+ ("action.select_leftright", {"type": params.select_mouse, "value": 'CLICK', "ctrl": True},
{"properties": [("mode", 'CHECK'), ("extend", False)]}),
("action.select_leftright", {"type": params.select_mouse, "value": 'PRESS', "shift": True, "ctrl": True},
{"properties": [("mode", 'CHECK'), ("extend", True)]}),
@@ -1935,6 +1941,12 @@ def km_dopesheet(params):
{"properties": [("axis_range", False)]}),
("action.select_box", {"type": 'B', "value": 'PRESS', "alt": True},
{"properties": [("axis_range", True)]}),
+ ("action.select_box", {"type": params.select_tweak, "value": 'ANY'},
+ {"properties":[("axis_range", False), ("wait_for_input", False), ("mode", 'SET')]}),
+ ("action.select_box", {"type": params.select_tweak, "value": 'ANY', "shift": True},
+ {"properties":[("axis_range", False), ("wait_for_input", False), ("mode", 'ADD')]}),
+ ("action.select_box", {"type": params.select_tweak, "value": 'ANY', "ctrl": True},
+ {"properties":[("axis_range", False), ("wait_for_input", False), ("mode", 'SUB')]}),
("action.select_lasso", {"type": params.action_tweak, "value": 'ANY', "ctrl": True},
{"properties": [("mode", 'ADD')]}),
("action.select_lasso", {"type": params.action_tweak, "value": 'ANY', "shift": True, "ctrl": True},
@@ -1977,7 +1989,7 @@ def km_dopesheet(params):
("anim.channels_find", {"type": 'F', "value": 'PRESS', "ctrl": True}, None),
("transform.transform", {"type": 'G', "value": 'PRESS'},
{"properties": [("mode", 'TIME_TRANSLATE')]}),
- ("transform.transform", {"type": params.select_tweak, "value": 'ANY'},
+ ("transform.transform", {"type": params.select_mouse, "value": 'PRESS'},
{"properties": [("mode", 'TIME_TRANSLATE')]}),
("transform.transform", {"type": 'E', "value": 'PRESS'},
{"properties": [("mode", 'TIME_EXTEND')]}),
@@ -2067,7 +2079,7 @@ def km_nla_editor(params):
{"properties": [("extend", False), ("deselect_all", not params.legacy)]}),
("nla.click_select", {"type": params.select_mouse, "value": 'PRESS', "shift": True},
{"properties": [("extend", True)]}),
- ("nla.select_leftright", {"type": params.select_mouse, "value": 'PRESS', "ctrl": True},
+ ("nla.select_leftright", {"type": params.select_mouse, "value": 'CLICK', "ctrl": True},
{"properties": [("mode", 'CHECK'), ("extend", False)]}),
("nla.select_leftright", {"type": params.select_mouse, "value": 'PRESS', "shift": True, "ctrl": True},
{"properties": [("mode", 'CHECK'), ("extend", True)]}),
@@ -2080,6 +2092,12 @@ def km_nla_editor(params):
{"properties": [("axis_range", False)]}),
("nla.select_box", {"type": 'B', "value": 'PRESS', "alt": True},
{"properties": [("axis_range", True)]}),
+ ("nla.select_box", {"type": params.select_tweak, "value": 'ANY'},
+ {"properties":[("wait_for_input", False), ("mode", 'SET')]}),
+ ("nla.select_box", {"type": params.select_tweak, "value": 'ANY', "shift": True},
+ {"properties":[("wait_for_input", False), ("mode", 'ADD')]}),
+ ("nla.select_box", {"type": params.select_tweak, "value": 'ANY', "ctrl": True},
+ {"properties":[("wait_for_input", False), ("mode", 'SUB')]}),
("nla.previewrange_set", {"type": 'P', "value": 'PRESS', "ctrl": True, "alt": True}, None),
("nla.view_all", {"type": 'HOME', "value": 'PRESS'}, None),
("nla.view_all", {"type": 'NDOF_BUTTON_FIT', "value": 'PRESS'}, None),
@@ -2109,7 +2127,7 @@ def km_nla_editor(params):
("nla.fmodifier_add", {"type": 'M', "value": 'PRESS', "shift": True, "ctrl": True}, None),
("transform.transform", {"type": 'G', "value": 'PRESS'},
{"properties": [("mode", 'TRANSLATION')]}),
- ("transform.transform", {"type": params.select_tweak, "value": 'ANY'},
+ ("transform.transform", {"type": params.select_mouse, "value": 'PRESS'},
{"properties": [("mode", 'TRANSLATION')]}),
("transform.transform", {"type": 'E', "value": 'PRESS'},
{"properties": [("mode", 'TIME_EXTEND')]}),
@@ -2414,7 +2432,7 @@ def km_sequencer(params):
("sequencer.select", {"type": params.select_mouse, "value": 'PRESS'},
{"properties": [("extend", False), ("deselect_all", True),
("linked_handle", False), ("left_right", 'NONE'), ("linked_time", False)]}),
- ("sequencer.select", {"type": params.select_mouse, "value": 'PRESS', "shift": True},
+ ("sequencer.select", {"type": params.select_mouse, "value": 'CLICK', "shift": True},
{"properties": [("extend", True), ("linked_handle", False), ("left_right", 'NONE'), ("linked_time", False)]}),
("sequencer.select", {"type": params.select_mouse, "value": 'PRESS', "alt": True},
{"properties": [("extend", False), ("linked_handle", True), ("left_right", 'NONE'), ("linked_time", False)]}),
@@ -2432,6 +2450,12 @@ def km_sequencer(params):
{"properties": [("extend", True)]}),
("sequencer.select_linked", {"type": 'L', "value": 'PRESS', "ctrl": True}, None),
("sequencer.select_box", {"type": 'B', "value": 'PRESS'}, None),
+ ("sequencer.select_box", {"type": params.select_tweak, "value": 'ANY'},
+ {"properties":[("wait_for_input", False), ("mode", 'SET')]}),
+ ("sequencer.select_box", {"type": params.select_tweak, "value": 'ANY', "shift": True},
+ {"properties":[("wait_for_input", False), ("mode", 'ADD')]}),
+ ("sequencer.select_box", {"type": params.select_tweak, "value": 'ANY', "ctrl": True},
+ {"properties":[("wait_for_input", False), ("mode", 'SUB')]}),
("sequencer.select_grouped", {"type": 'G', "value": 'PRESS', "shift": True}, None),
op_menu("SEQUENCER_MT_add", {"type": 'A', "value": 'PRESS', "shift": True}),
op_menu("SEQUENCER_MT_change", {"type": 'C', "value": 'PRESS'}),
@@ -2440,7 +2464,7 @@ def km_sequencer(params):
("wm.context_set_int", {"type": 'O', "value": 'PRESS'},
{"properties": [("data_path", 'scene.sequence_editor.overlay_frame'), ("value", 0)]}),
("transform.seq_slide", {"type": 'G', "value": 'PRESS'}, None),
- ("transform.seq_slide", {"type": params.select_tweak, "value": 'ANY'}, None),
+ ("transform.seq_slide", {"type": params.select_mouse, "value": 'PRESS'}, None),
("transform.transform", {"type": 'E', "value": 'PRESS'},
{"properties": [("mode", 'TIME_EXTEND')]}),
("marker.add", {"type": 'M', "value": 'PRESS'}, None),