Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCampbell Barton <ideasman42@gmail.com>2018-04-30 14:46:01 +0300
committerCampbell Barton <ideasman42@gmail.com>2018-04-30 14:46:01 +0300
commit005711ffefa82037ecb95008da4bd6786a8ee799 (patch)
tree4b6f3aef32ceb5fcf2e8473bb978bddee3be433a /release
parentea2146c3e12bee721f69e95718d3e38a30427891 (diff)
Fix sculpt ToolDef generation
With non-default sculpt brushes, tool generation could fail.
Diffstat (limited to 'release')
-rw-r--r--release/scripts/startup/bl_ui/space_toolsystem_toolbar.py4
1 files changed, 2 insertions, 2 deletions
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