blender
/
blender
134
399
Fork 582
Code Issues 6.2k Pull Requests 755 Projects 19 Wiki Activity

WIP: Brush assets project #106303

Draft
Julian Eisel wants to merge 351 commits from brush-assets-project into main
pull from: brush-assets-project
merge into: blender:main

When changing the target branch, be careful to rebase the branch in your fork to match. See documentation.
Conversation 6 Commits 351 Files Changed 124 +10 -12
1 changed files with 10 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit f6898f9bcb - Show all commits

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

@ -1384,12 +1384,11 @@ class _defs_sculpt:
@staticmethod
def generate_brush_tool(context):
if not context:
return ()
brush = context.tool_settings.sculpt.brush
if not brush:
return ()
tool = brush.sculpt_tool
tool = None
if context:
brush = context.tool_settings.sculpt.brush
if brush:
tool = brush.sculpt_tool
return [
ToolDef.from_dict(
dict(
@ -2449,12 +2448,11 @@ class _defs_curves_sculpt:
@staticmethod
def generate_brush_tool(context):
if not context:
return ()
brush = context.tool_settings.curves_sculpt.brush
if not brush:
return ()
tool = brush.curves_sculpt_tool
tool = None
if context:
brush = context.tool_settings.sculpt.brush
if brush:
tool = brush.curves_sculpt_tool
return [
ToolDef.from_dict(
dict(