[Bf-blender-cvs] [02d57027975] tracking_tools: Fix crash on startup after previous keymap change

Sergey Sharybin noreply at git.blender.org
Tue May 17 15:30:37 CEST 2022


Commit: 02d57027975c061320025600bb41587e8c447db9
Author: Sergey Sharybin
Date:   Tue May 17 15:29:28 2022 +0200
Branches: tracking_tools
https://developer.blender.org/rB02d57027975c061320025600bb41587e8c447db9

Fix crash on startup after previous keymap change

Use list instead of tuple, even when modification is not needed.

Not sure why this was causing issues on just Linux, but this seems
to what all other places in the keymap are using.

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

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 d489f9bf5fd..fe54c9aae8a 100644
--- a/release/scripts/presets/keyconfig/keymap_data/blender_default.py
+++ b/release/scripts/presets/keyconfig/keymap_data/blender_default.py
@@ -6612,7 +6612,7 @@ def km_image_editor_tool_uv_scale(params):
 # Tool System (Clip Editor)
 
 def _template_items_clip_tool_mouse_selection(params, use_release = False):
-    return (
+    return [
         ("clip.select", {"type": params.select_mouse, "value": 'RELEASE' if use_release else 'PRESS'},
             {"properties": [
                 ("extend", False),
@@ -6621,7 +6621,7 @@ def _template_items_clip_tool_mouse_selection(params, use_release = False):
          ),
         ("clip.select", {"type": params.select_mouse, "value": 'PRESS', "shift": True},
             {"properties": [("extend", True)]}),
-    )
+    ]
 
 
 def _template_items_clip_tool_tweak_selection(params):
@@ -6633,10 +6633,12 @@ def _template_items_clip_tool_tweak_selection(params):
         items.append(
             ("clip.select", {"type": 'LEFTMOUSE', "value": 'PRESS'},
                 {"properties": [
-                    ("extend", False),
-                    ("deselect_all", True),
-                    ("activate_selected", True)]}
-             ),
+                        ("extend", False),
+                        ("deselect_all", True),
+                        ("activate_selected", True),
+                    ]
+                }
+            )
         )
 
     return items
@@ -6652,22 +6654,22 @@ def _template_items_clip_tool_tweak(params):
 
 
 def km_clip_editor_tool_select(params):
-    return (
+    return [
         "Clip Editor: Tweak",
         {"space_type": 'CLIP_EDITOR', "region_type": 'WINDOW'},
         {"items": _template_items_clip_tool_tweak(params)},
-    )
+    ]
 
 
 def km_clip_editor_tool_select_box(params):
     return (
         "Clip Editor: Select Box",
         {"space_type": 'CLIP_EDITOR', "region_type": 'WINDOW'},
-        {"items": (
-            *_template_items_clip_tool_mouse_selection(params, params.select_mouse == 'LEFTMOUSE'),
-            *_template_items_tool_select_actions_simple(
-                "clip.select_box", type=params.tool_mouse, value='CLICK_DRAG'),
-        )
+        {"items": [
+                *_template_items_clip_tool_mouse_selection(params, params.select_mouse == 'LEFTMOUSE'),
+                *_template_items_tool_select_actions_simple(
+                    "clip.select_box", type=params.tool_mouse, value='CLICK_DRAG'),
+            ]
         },
     )
 
@@ -6676,11 +6678,11 @@ def km_clip_editor_tool_select_lasso(params):
     return (
         "Clip Editor: Select Lasso",
         {"space_type": 'CLIP_EDITOR', "region_type": 'WINDOW'},
-        {"items": (
-            *_template_items_clip_tool_mouse_selection(params, params.select_mouse == 'LEFTMOUSE'),
-            *_template_items_tool_select_actions_simple(
-                "clip.select_lasso", type=params.tool_mouse, value='PRESS'),
-        )
+        {"items": [
+                *_template_items_clip_tool_mouse_selection(params, params.select_mouse == 'LEFTMOUSE'),
+                *_template_items_tool_select_actions_simple(
+                    "clip.select_lasso", type=params.tool_mouse, value='PRESS'),
+            ]
         },
     )
 
@@ -6689,13 +6691,13 @@ def km_clip_editor_tool_select_circle(params):
     return (
         "Clip Editor: Select Circle",
         {"space_type": 'CLIP_EDITOR', "region_type": 'WINDOW'},
-        {"items": (
-            *_template_items_clip_tool_mouse_selection(params, params.select_mouse == 'LEFTMOUSE'),
-            *_template_items_tool_select_actions_simple(
-                "clip.select_circle", type=params.tool_mouse, value='PRESS',
-                properties=[("wait_for_input", False)],
-            )
-        )},
+        {"items": [
+                *_template_items_clip_tool_mouse_selection(params, params.select_mouse == 'LEFTMOUSE'),
+                *_template_items_tool_select_actions_simple(
+                    "clip.select_circle", type=params.tool_mouse, value='PRESS',
+                    properties=[("wait_for_input", False)]),
+            ]
+        },
     )
 
 
@@ -6703,10 +6705,11 @@ def km_clip_editor_tool_add_marker_tweak(params):
     return (
         "Clip Editor: Add Marker and Tweak",
         {"space_type": 'CLIP_EDITOR', "region_type": 'WINDOW'},
-        {"items": (
-            *_template_items_clip_tool_tweak(params),
-            ("clip.add_marker_slide", {"type": 'LEFTMOUSE', "value": 'PRESS'}, None),
-        )},
+        {"items": [
+                *_template_items_clip_tool_tweak(params),
+                ("clip.add_marker_slide", {"type": 'LEFTMOUSE', "value": 'PRESS'}, None),
+            ]
+        },
     )



More information about the Bf-blender-cvs mailing list