[Bf-blender-cvs] [0e6c56760ce] blender-v2.83-release: Fix T74600: Sequencer blade tool inaccessible with RMB select
Campbell Barton
noreply at git.blender.org
Mon Apr 20 09:19:57 CEST 2020
Commit: 0e6c56760ce092e43325634773b780c28abc0bde
Author: Campbell Barton
Date: Mon Apr 20 17:15:47 2020 +1000
Branches: blender-v2.83-release
https://developer.blender.org/rB0e6c56760ce092e43325634773b780c28abc0bde
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.
===================================================================
M release/scripts/presets/keyconfig/keymap_data/blender_default.py
===================================================================
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),
]},
)
More information about the Bf-blender-cvs
mailing list