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:
authorCampbell Barton <ideasman42@gmail.com>2020-04-20 10:15:47 +0300
committerCampbell Barton <ideasman42@gmail.com>2020-04-20 10:15:47 +0300
commit0e6c56760ce092e43325634773b780c28abc0bde (patch)
treebfeb0ed0a2bc4ca2cb4c28962b0ca676c82203a6 /release
parent23bb42a06e283c154ccf2048e0d3880abdd3af3f (diff)
Fix T74600: Sequencer blade tool inaccessible with RMB select
Declare `anim.change_frame` explicitly for each editor. In sequencer, scrubbing in editor area is possible only with select/tweak tool. This change is to resolve conflict between scrubbing and tool actions.
Diffstat (limited to 'release')
-rw-r--r--release/scripts/presets/keyconfig/keymap_data/blender_default.py23
1 files changed, 14 insertions, 9 deletions
diff --git a/release/scripts/presets/keyconfig/keymap_data/blender_default.py b/release/scripts/presets/keyconfig/keymap_data/blender_default.py
index 22afe9fd7ce..2ff7206bcda 100644
--- a/release/scripts/presets/keyconfig/keymap_data/blender_default.py
+++ b/release/scripts/presets/keyconfig/keymap_data/blender_default.py
@@ -296,6 +296,17 @@ def _template_items_proportional_editing(*, connected=False):
]
+def _template_items_change_frame(params):
+ if params.select_mouse == 'LEFTMOUSE' and not params.legacy:
+ return [
+ ("anim.change_frame", {"type": 'RIGHTMOUSE', "value": 'PRESS', "shift": True}, None),
+ ]
+ else:
+ return [
+ ("anim.change_frame", {"type": params.action_mouse, "value": 'PRESS'}, None),
+ ]
+
+
# Tool System Templates
def _template_items_tool_select(params, operator, cursor_operator, *, extend):
@@ -2073,6 +2084,7 @@ def km_dopesheet(params):
("marker.rename", {"type": 'M', "value": 'PRESS', "ctrl": True}, None),
("marker.camera_bind", {"type": 'B', "value": 'PRESS', "ctrl": True}, None),
*_template_items_context_menu("DOPESHEET_MT_context_menu", params.context_menu_event),
+ *_template_items_change_frame(params),
])
return keymap
@@ -2198,6 +2210,7 @@ def km_nla_editor(params):
("marker.add", {"type": 'M', "value": 'PRESS'}, None),
("marker.rename", {"type": 'M', "value": 'PRESS', "ctrl": True}, None),
*_template_items_context_menu("NLA_MT_context_menu", params.context_menu_event),
+ *_template_items_change_frame(params),
])
return keymap
@@ -2930,15 +2943,6 @@ def km_animation(params):
("anim.end_frame_set", {"type": 'END', "value": 'PRESS', "ctrl": True}, None),
])
- if params.select_mouse == 'LEFTMOUSE' and not params.legacy:
- items.extend([
- ("anim.change_frame", {"type": 'RIGHTMOUSE', "value": 'PRESS', "shift": True}, None),
- ])
- else:
- items.extend([
- ("anim.change_frame", {"type": params.action_mouse, "value": 'PRESS'}, None),
- ])
-
return keymap
@@ -6502,6 +6506,7 @@ def km_sequencer_editor_tool_select(params):
{"items": [
("sequencer.select", {"type": params.select_mouse, "value": 'PRESS'},
{"properties": [("extend", False), ("deselect_all", not params.legacy)]}),
+ *_template_items_change_frame(params),
]},
)