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

WIP: Brush assets project #106303

Draft
Julian Eisel wants to merge 352 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 352 Files Changed 124 +1 -1
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 64db6bd4be - Show all commits

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

@ -705,7 +705,7 @@ bool BKE_paint_brush_asset_set(Paint *paint,
{
/* Should not happen for users if brush assets are properly filtered by mode, but still protect
* against it in case of invalid API usage. */
if (paint->runtime.ob_mode != brush->ob_mode) {
if (brush && paint->runtime.ob_mode != brush->ob_mode) {
BKE_asset_weak_reference_free(&weak_asset_reference);
return false;
}