blender
/
blender
134
399
Fork 583
Code Issues 6.3k Pull Requests 753 Projects 19 Wiki Activity

WIP: Brush assets project #106303

Draft
Julian Eisel wants to merge 354 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 354 Files Changed 125 +2
1 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 4ab5e38eca - Show all commits

2
source/blender/blenkernel/intern/paint.cc
View File

@ -683,7 +683,9 @@ static void paint_brush_asset_update(Paint &paint,
Brush *brush,
const AssetWeakReference &brush_asset_reference)
{
BLI_assert(&brush_asset_reference != paint.brush_asset_reference);
MEM_delete(paint.brush_asset_reference);
paint.brush_asset_reference = nullptr;
if (brush == nullptr || brush != paint.brush || !(brush->id.tag & LIB_TAG_ASSET_MAIN)) {
return;