blender
/
blender
137
417
Fork 599
Code Issues 6.3k Pull Requests 776 Projects 19 Wiki Activity

Brush Assets: Store assets outside Main #117730

Manually merged
Brecht Van Lommel merged 18 commits from brecht/blender:brush-separate-main into brush-assets-project 2024-02-27 14:53:03 +01:00
Conversation 2 Commits 18 Files Changed 27 +6 -3
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 64d07edd0c - Show all commits

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

@ -141,7 +141,10 @@ struct AssetWeakReferenceMain {
std::string filepath;
Main *main;
AssetWeakReferenceMain(const char *filepath) : filepath(filepath), main(BKE_main_new()) {}
AssetWeakReferenceMain(std::string filepath)
: filepath(std::move(filepath)), main(BKE_main_new())
{
}
AssetWeakReferenceMain(const AssetWeakReferenceMain &) = delete;
AssetWeakReferenceMain(AssetWeakReferenceMain &&other)
: filepath(std::exchange(other.filepath, "")), main(std::exchange(other.main, nullptr))
@ -182,7 +185,7 @@ Main *BKE_asset_weak_reference_main(Main *global_main, const ID *id)
return nullptr;
}
static Main *asset_weak_reference_main_ensure(const char *filepath)
static Main *asset_weak_reference_main_ensure(const StringRef filepath)
{
for (const AssetWeakReferenceMain &weak_ref_main : get_weak_reference_mains()) {
if (weak_ref_main.filepath == filepath) {
@ -190,7 +193,7 @@ static Main *asset_weak_reference_main_ensure(const char *filepath)
}
}
get_weak_reference_mains().append(filepath);
get_weak_reference_mains().append_as(filepath);
return get_weak_reference_mains().last().main;
}