blender
/
blender
136
407
Fork 589
Code Issues 6.3k Pull Requests 779 Projects 19 Wiki Activity

Brush Assets: Switch to a single "Brush" active tool #117491

Merged
Hans Goudey merged 11 commits from HooglyBoogly/blender:brush-assets-single-tool into brush-assets-project 2024-01-26 21:08:24 +01:00
Conversation 0 Commits 11 Files Changed 4 +7 -5
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 233869b481 - Show all commits

12
scripts/startup/bl_ui/space_toolsystem_toolbar.py
View File

@ -1389,12 +1389,13 @@ class _defs_sculpt:
brush = context.tool_settings.sculpt.brush
if not brush:
return ()
tool = brush.sculpt_tool
return [
ToolDef.from_dict(
dict(
idname="builtin_brush.Paint",
idname="builtin.brush",
label=brush.name,
icon=icon,
icon="builtin_brush.paint",
data_block=tool
)
)
@ -2440,12 +2441,13 @@ class _defs_curves_sculpt:
brush = context.tool_settings.curves_sculpt.brush
if not brush:
return ()
tool = brush.curves_sculpt_tool
return [
ToolDef.from_dict(
dict(
idname="builtin_brush.Paint",
idname="builtin.brush",
label=brush.name,
icon=icon,
icon="builtin_brush.paint",
data_block=tool
)
)
@ -3086,7 +3088,7 @@ class VIEW3D_PT_tools_active(ToolSelectPanelHelper, Panel):
],
'SCULPT': [
lambda context: (
_defs_curves_sculpt.generate_brush_tool(context)
_defs_sculpt.generate_brush_tool(context)
),
None,
(