[Bf-blender-cvs] [fa6b1007bad] master: Fix script_load_keymap failure from c9d9bfa84ad5cb985e3feccffa702b2f3cc2adf8

Campbell Barton noreply at git.blender.org
Tue Sep 21 14:21:07 CEST 2021


Commit: fa6b1007bad065440950cd67deb16a04f368856f
Author: Campbell Barton
Date:   Tue Sep 21 22:17:08 2021 +1000
Branches: master
https://developer.blender.org/rBfa6b1007bad065440950cd67deb16a04f368856f

Fix script_load_keymap failure from c9d9bfa84ad5cb985e3feccffa702b2f3cc2adf8

Scanning the keymap hierarchy (used in the preferences),
caused the test to fail.

Don't attempt add fallback keymaps for dynamic keymap callbacks.

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

M	release/scripts/startup/bl_ui/space_toolsystem_common.py

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

diff --git a/release/scripts/startup/bl_ui/space_toolsystem_common.py b/release/scripts/startup/bl_ui/space_toolsystem_common.py
index 1c3dbded083..98e29d3baba 100644
--- a/release/scripts/startup/bl_ui/space_toolsystem_common.py
+++ b/release/scripts/startup/bl_ui/space_toolsystem_common.py
@@ -539,7 +539,9 @@ class ToolSelectPanelHelper:
                     visited.add(km_name)
 
                     yield (km_name, cls.bl_space_type, 'WINDOW', [])
-                    yield (km_name + " (fallback)", cls.bl_space_type, 'WINDOW', [])
+                    # Callable types don't use fall-backs.
+                    if isinstance(km_name, str):
+                        yield (km_name + " (fallback)", cls.bl_space_type, 'WINDOW', [])
 
     # -------------------------------------------------------------------------
     # Layout Generators



More information about the Bf-blender-cvs mailing list