blender
/
blender
134
400
Fork 583
Code Issues 6.3k Pull Requests 759 Projects 19 Wiki Activity

WIP: Brush assets project #106303

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

5
source/blender/editors/sculpt_paint/paint_ops.cc
View File

@ -1097,9 +1097,12 @@ static bool brush_asset_delete_poll(bContext *C)
if (paint == nullptr || brush == nullptr) {
return false;
}
if (!paint->brush_asset_reference) {
return false;
}
/* Asset brush, check if belongs to an editable blend file. */
if (paint->brush_asset_reference && ID_IS_ASSET(brush)) {
if (ID_IS_ASSET(brush)) {
if (!bke::asset_edit_id_is_editable(&brush->id)) {
CTX_wm_operator_poll_msg_set(C, "Asset blend file is not editable");
return false;