[Bf-blender-cvs] [4f28b881a67] tracking_tools: Tracking: Always allow LMB select for tweak tools

Sergey Sharybin noreply at git.blender.org
Fri May 13 17:01:21 CEST 2022


Commit: 4f28b881a67fb06a15d7b2966fafe2a808314ecc
Author: Sergey Sharybin
Date:   Fri May 13 16:53:20 2022 +0200
Branches: tracking_tools
https://developer.blender.org/rB4f28b881a67fb06a15d7b2966fafe2a808314ecc

Tracking: Always allow LMB select for tweak tools

Similar to the nodes editor: makes it very easy and convenient to
alter markers.

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

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 e4c9f3f141b..d08786e6ba8 100644
--- a/release/scripts/presets/keyconfig/keymap_data/blender_default.py
+++ b/release/scripts/presets/keyconfig/keymap_data/blender_default.py
@@ -6615,21 +6615,43 @@ def km_image_editor_tool_uv_scale(params):
 # ------------------------------------------------------------------------------
 # Tool System (Clip Editor)
 
+def _template_items_clip_tool_tweak_selection(params):
+    items = [
+        ("clip.select", {"type": params.select_mouse, "value": 'PRESS'},
+            {"properties": [
+                ("extend", False),
+                ("deselect_all", True),
+                ("activate_selected", params.select_mouse == 'LEFTMOUSE')]}
+         ),
+    ]
+
+    if params.select_mouse == 'RIGHTMOUSE':
+        items.append(
+            ("clip.select", {"type": 'LEFTMOUSE', "value": 'PRESS'},
+                {"properties": [
+                    ("extend", False),
+                    ("deselect_all", True),
+                    ("activate_selected", True)]}
+             ),
+        )
+
+    return items
+
+
+def _template_items_clip_tool_tweak(params):
+    return [
+        ("clip.change_frame", {"type": 'LEFTMOUSE', "value": 'PRESS'}, None),
+        *_template_items_clip_tool_tweak_selection(params),
+        ("clip.slide_marker", {"type": 'LEFTMOUSE', "value": 'PRESS'}, None),
+        ("clip.slide_plane_marker", {"type": 'LEFTMOUSE', "value": 'PRESS'}, None),
+    ]
+
+
 def km_clip_editor_tool_select(params):
     return (
         "Clip Editor: Tweak",
         {"space_type": 'CLIP_EDITOR', "region_type": 'WINDOW'},
-        {"items": [
-            ("clip.change_frame", {"type": 'LEFTMOUSE', "value": 'PRESS'}, None),
-            ("clip.select", {"type": params.select_mouse, "value": 'PRESS'},
-             {"properties": [
-                 ("extend", False),
-                 ("deselect_all", True),
-                 ("activate_selected", params.select_mouse == 'LEFTMOUSE')]}
-             ),
-            ("clip.slide_marker", {"type": 'LEFTMOUSE', "value": 'PRESS'}, None),
-            ("clip.slide_plane_marker", {"type": 'LEFTMOUSE', "value": 'PRESS'}, None),
-        ]},
+        {"items": _template_items_clip_tool_tweak(params)},
     )
 
 
@@ -6669,15 +6691,7 @@ def km_clip_editor_tool_add_marker_tweak(params):
         "Clip Editor: Add Marker and Tweak",
         {"space_type": 'CLIP_EDITOR', "region_type": 'WINDOW'},
         {"items": [
-            ("clip.change_frame", {"type": 'LEFTMOUSE', "value": 'PRESS'}, None),
-            ("clip.select", {"type": params.select_mouse, "value": 'PRESS'},
-             {"properties": [
-                 ("extend", False),
-                 ("deselect_all", True),
-                 ("activate_selected", params.select_mouse == 'LEFTMOUSE')]}
-             ),
-            ("clip.slide_marker", {"type": 'LEFTMOUSE', "value": 'PRESS'}, None),
-            ("clip.slide_plane_marker", {"type": 'LEFTMOUSE', "value": 'PRESS'}, None),
+            *_template_items_clip_tool_tweak(params),
             ("clip.add_marker_slide", {"type": 'LEFTMOUSE', "value": 'PRESS'}, None),
         ]},
     )



More information about the Bf-blender-cvs mailing list