[Bf-blender-cvs] [53261df6f0e] master: Fix keymap "use_tweak_tool_lmb_interaction" blocking sequencer scrub

[Campbell Barton]

Commit: 53261df6f0ea6e731f1b71c1dd86ee618abf7f59
Author: Campbell Barton
Date:   Tue Apr 5 12:29:32 2022 +1000
Branches: master
https://developer.blender.org/rB53261df6f0ea6e731f1b71c1dd86ee618abf7f59

Fix keymap "use_tweak_tool_lmb_interaction" blocking sequencer scrub

Ignore this experimental preference for the sequencer.

===================================================================

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 289867af455..2f148c174b0 100644
--- a/release/scripts/presets/keyconfig/keymap_data/blender_default.py
+++ b/release/scripts/presets/keyconfig/keymap_data/blender_default.py
@@ -457,7 +457,7 @@ def _template_items_change_frame(params):
 
 # Tool System Templates
 
-def _template_items_tool_select(params, operator, cursor_operator, fallback):
+def _template_items_tool_select(params, operator, cursor_operator, *, cursor_prioritize=False, fallback=False):
     if params.select_mouse == 'LEFTMOUSE':
         # By default use 'PRESS' for immediate select without quick delay.
         # Fallback key-maps 'CLICK' since 'PRESS' events passes through (allowing either click or drag).
@@ -480,7 +480,7 @@ def _template_items_tool_select(params, operator, cursor_operator, fallback):
         ]
     else:
         # Experimental support for LMB interaction for the tweak tool.
-        if params.use_tweak_tool_lmb_interaction and not fallback:
+        if params.use_tweak_tool_lmb_interaction and (not cursor_prioritize) and (not fallback):
             return [
                 (operator, {"type": 'LEFTMOUSE', "value": 'PRESS'},
                  {"properties": [("deselect_all", True), ("select_passthrough", True)]}),
@@ -6399,7 +6399,7 @@ def km_image_editor_tool_uv_select(params, *, fallback):
         {"space_type": 'IMAGE_EDITOR', "region_type": 'WINDOW'},
         {"items": [
             *([] if (fallback and (params.select_mouse == 'RIGHTMOUSE')) else _template_items_tool_select(
-                params, "uv.select", "uv.cursor_set", fallback)),
+                params, "uv.select", "uv.cursor_set", fallback=fallback)),
             *([] if (not params.use_fallback_tool_rmb) else _template_uv_select(
                 type=params.select_mouse,
                 value=params.select_mouse_value,
@@ -6610,7 +6610,7 @@ def km_3d_view_tool_select(params, *, fallback):
         {"space_type": 'VIEW_3D', "region_type": 'WINDOW'},
         {"items": [
             *([] if (fallback and (params.select_mouse == 'RIGHTMOUSE')) else _template_items_tool_select(
-                params, "view3d.select", "view3d.cursor3d", fallback)),
+                params, "view3d.select", "view3d.cursor3d", fallback=fallback)),
             *([] if (not params.use_fallback_tool_rmb) else _template_view3d_select(
                 type=params.select_mouse,
                 value=params.select_mouse_value,
@@ -7548,7 +7548,7 @@ def km_3d_view_tool_edit_gpencil_select(params, *, fallback):
         {"space_type": 'VIEW_3D', "region_type": 'WINDOW'},
         {"items": [
             *([] if (fallback and (params.select_mouse == 'RIGHTMOUSE')) else _template_items_tool_select(
-                params, "gpencil.select", "view3d.cursor3d", fallback)),
+                params, "gpencil.select", "view3d.cursor3d", fallback=fallback)),
             *([] if (not params.use_fallback_tool_rmb) else _template_view3d_gpencil_select(
                 type=params.select_mouse, value=params.select_mouse_value, legacy=params.legacy)),
         ]},
@@ -7686,7 +7686,7 @@ def km_3d_view_tool_sculpt_gpencil_select(params):
     return (
         "3D View Tool: Sculpt Gpencil, Tweak",
         {"space_type": 'VIEW_3D', "region_type": 'WINDOW'},
-        {"items": _template_items_tool_select(params, "gpencil.select", "view3d.cursor3d", False)},
+        {"items": _template_items_tool_select(params, "gpencil.select", "view3d.cursor3d")},
     )
 
 
@@ -7726,7 +7726,7 @@ def km_sequencer_editor_tool_generic_select(params, *, fallback):
         {"space_type": 'SEQUENCE_EDITOR', "region_type": 'WINDOW'},
         {"items": [
             *([] if (fallback and (params.select_mouse == 'RIGHTMOUSE')) else _template_items_tool_select(
-                params, "sequencer.select", "sequencer.cursor_set", fallback)),
+                params, "sequencer.select", "sequencer.cursor_set", cursor_prioritize=True, fallback=fallback)),
 
             *([] if (not params.use_fallback_tool_rmb) else _template_sequencer_preview_select(
                 type=params.select_mouse, value=params.select_mouse_value, legacy=params.legacy)),