[Bf-blender-cvs] [f7d9db5e687] blender2.8: Missed last commit

Campbell Barton noreply at git.blender.org
Thu Apr 26 08:11:06 CEST 2018


Commit: f7d9db5e687fac3df9bdab0c478f86ea723bf9d7
Author: Campbell Barton
Date:   Thu Apr 26 08:10:52 2018 +0200
Branches: blender2.8
https://developer.blender.org/rBf7d9db5e687fac3df9bdab0c478f86ea723bf9d7

Missed last commit

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

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 63f9cb0ce96..b3a4ce976f1 100644
--- a/release/scripts/startup/bl_ui/space_toolsystem_common.py
+++ b/release/scripts/startup/bl_ui/space_toolsystem_common.py
@@ -141,9 +141,9 @@ class ToolSelectPanelHelper:
                 else:
                     setattr(rna_props, prop_id, value)
 
-        if mode is None:
-            mode = "All"
-        km_idname = f"{cls.keymap_prefix} {mode}, {text}"
+        if context_mode is None:
+            context_mode = "All"
+        km_idname = f"{cls.keymap_prefix} {context_mode}, {text}"
         km = kc.keymaps.get(km_idname)
         if km is not None:
             return km, km_idname
@@ -165,7 +165,7 @@ class ToolSelectPanelHelper:
         # This needs some careful consideration.
         kc = wm.keyconfigs.user
 
-        # {mode: {tool_name: (keymap, keymap_idname, manipulator_group_idname), ...}, ...}
+        # {context_mode: {tool_name: (keymap, keymap_idname, manipulator_group_idname), ...}, ...}
         cls._tool_keymap = {}
 
         # Track which tool-group was last used for non-active groups.



More information about the Bf-blender-cvs mailing list