[Bf-blender-cvs] [05fbb0d50ee] master: Fix separators use within tool groups

Campbell Barton noreply at git.blender.org
Thu Mar 14 07:28:23 CET 2019


Commit: 05fbb0d50eee8c5599da3e93d14c95c191ddeb51
Author: Campbell Barton
Date:   Thu Mar 14 17:27:22 2019 +1100
Branches: master
https://developer.blender.org/rB05fbb0d50eee8c5599da3e93d14c95c191ddeb51

Fix separators use within tool groups

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

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 44ae5c2490a..72b90e90bf7 100644
--- a/release/scripts/startup/bl_ui/space_toolsystem_common.py
+++ b/release/scripts/startup/bl_ui/space_toolsystem_common.py
@@ -227,7 +227,7 @@ class ToolSelectPanelHelper:
                 i = 0
                 for sub_item in item:
                     if sub_item is None:
-                        yield None
+                        yield None, -1
                     elif _item_is_fn(sub_item):
                         for item_dyn in sub_item(context):
                             yield item_dyn, i
@@ -585,7 +585,7 @@ class WM_MT_toolsystem_submenu(Menu):
             for item_group in cls.tools_from_context(context):
                 if type(item_group) is tuple:
                     for sub_item in item_group:
-                        if sub_item.text == button_text:
+                        if (sub_item is not None) and (sub_item.text == button_text):
                             return cls, item_group
         return None, None



More information about the Bf-blender-cvs mailing list