blender
/
blender
136
407
Fork 589
Code Issues 6.3k Pull Requests 779 Projects 19 Wiki Activity

Brush Assets: Make revert and delete operators affect dependencies #119806

Merged
Brecht Van Lommel merged 2 commits from brecht/blender:brush-revert-delete-all into brush-assets-project 2024-03-25 14:34:55 +01:00
Conversation 0 Commits 2 Files Changed 4 +6 -2
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 6c9744feee - Show all commits

5
source/blender/blenkernel/intern/asset_weak_reference.cc
View File

@ -152,6 +152,9 @@ struct AssetWeakReferenceMain {
}
AssetWeakReferenceMain &operator=(AssetWeakReferenceMain &&other)
{
if (this == &other) {
brecht marked this conversation as resolved Outdated
Hans Goudey commented 2024-03-22 21:01:31 +01:00
Outdated
Review
Copy Link

I think this needs a this == &other check

I think this needs a `this == &other` check
return *this;
}
this->filepath = std::exchange(other.filepath, "");
this->main = std::exchange(other.main, nullptr);
return *this;
@ -183,7 +186,7 @@ void AssetWeakReferenceMain::reload(Main &global_main)
brecht marked this conversation as resolved
Hans Goudey commented 2024-03-22 21:04:53 +01:00
Review
Copy Link

to be append -> to be appended

`to be append` -> `to be appended`
BKE_blendfile_link_append_context_library_add(lapp_context, this->filepath.c_str(), nullptr);
/* Requests all existing datablocks to be append again. */
/* Requests all existing datablocks to be appended again. */
ID *old_id;
FOREACH_MAIN_ID_BEGIN (old_main, old_id) {
ID_Type old_id_code = GS(old_id->name);

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

@ -1361,7 +1361,8 @@ static int brush_asset_revert_exec(bContext *C, wmOperator * /*op*/)
Brush *brush = BKE_paint_brush(paint);
Main *asset_main = BKE_main_from_id(bmain, &brush->id);
/* Reload entire main, including texture dependencies. */
/* Reload entire main, including texture dependencies. This relies on there
brecht marked this conversation as resolved Outdated
Hans Goudey commented 2024-03-22 21:03:04 +01:00
Outdated
Review
Copy Link

I'd add a comment here that this relies on a single brush asset stored per file

I'd add a comment here that this relies on a single brush asset stored per file
* being only a single brush asset per blend file. */
BKE_asset_weak_reference_main_reload(*bmain, *asset_main);
WM_main_add_notifier(NC_BRUSH | NA_EDITED, nullptr);