[Bf-blender-cvs] [005711ffefa] blender2.8: Fix sculpt ToolDef generation
Campbell Barton
noreply at git.blender.org
Mon Apr 30 13:47:28 CEST 2018
Commit: 005711ffefa82037ecb95008da4bd6786a8ee799
Author: Campbell Barton
Date: Mon Apr 30 13:46:01 2018 +0200
Branches: blender2.8
https://developer.blender.org/rB005711ffefa82037ecb95008da4bd6786a8ee799
Fix sculpt ToolDef generation
With non-default sculpt brushes, tool generation could fail.
===================================================================
M release/scripts/startup/bl_ui/space_toolsystem_toolbar.py
===================================================================
diff --git a/release/scripts/startup/bl_ui/space_toolsystem_toolbar.py b/release/scripts/startup/bl_ui/space_toolsystem_toolbar.py
index dd57d7878e8..1960fc4790e 100644
--- a/release/scripts/startup/bl_ui/space_toolsystem_toolbar.py
+++ b/release/scripts/startup/bl_ui/space_toolsystem_toolbar.py
@@ -522,7 +522,7 @@ class _defs_sculpt:
def tools_from_brush_group(*groups):
if len(groups) == 1:
- tool_defs = brush_categories.pop(groups[0], ())
+ tool_defs = tuple(brush_categories.pop(groups[0], ()))
else:
tool_defs = tuple(item for g in groups for item in brush_categories.pop(g, ()))
if len(tool_defs) > 1:
@@ -565,7 +565,7 @@ class VIEW3D_PT_tools_active(ToolSelectPanelHelper, Panel):
def tools_from_context(cls, context):
for tools in (cls._tools[None], cls._tools.get(context.mode, ())):
for item in tools:
- if not (type(item) is type and issubclass(item, ToolDef)) and callable(item):
+ if not (type(item) is ToolDef) and callable(item):
yield from item(context)
else:
yield item
More information about the Bf-blender-cvs
mailing list