blender
/
blender
137
416
Fork 599
Code Issues 6.3k Pull Requests 778 Projects 19 Wiki Activity

WIP: Brush assets project #106303

Draft
Julian Eisel wants to merge 381 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 8 Commits 381 Files Changed 86 +17 -17
1 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 2d45411108 - Show all commits

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

@ -1818,23 +1818,23 @@ class _defs_paint_grease_pencil:
# #
# @staticmethod # @staticmethod
# def generate_from_brushes(context): # def generate_from_brushes(context):
# # Though `data_block` is conceptually unnecessary with a single brush tool, # # Though `data_block` is conceptually unnecessary with a single brush tool,
# # it's still used because many areas assume that brush tools have it set #bToolRef. # # it's still used because many areas assume that brush tools have it set #bToolRef.
# tool = None # tool = None
# if context: # if context:
# brush = context.tool_settings.gpencil_paint.brush # brush = context.tool_settings.gpencil_paint.brush
# if brush: # if brush:
# tool = brush.gpencil_tool # tool = brush.gpencil_tool
# return [ # return [
# ToolDef.from_dict( # ToolDef.from_dict(
# dict( # dict(
# idname="builtin.brush", # idname="builtin.brush",
# label="Brush", # label="Brush",
# icon="brush.sculpt.paint", # icon="brush.sculpt.paint",
# data_block=tool # data_block=tool
# ) # )
# ) # )
# ] # ]
@ToolDef.from_fn @ToolDef.from_fn
def draw(): def draw():