archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Activity

Fix all library always tagging catalogs as changed

Browse Source
This commit is contained in:
Julian Eisel
2023-01-09 12:43:36 +01:00
parent 3af1113a96
commit a83d40c497
3 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
source/blender/asset_system/AS_asset_catalog.hh
View File

@@ -299,7 +299,7 @@ class AssetCatalogCollection {
std::unique_ptr<AssetCatalogCollection> deep_copy() const;
/**
* Copy the catalogs from \a other and append them to this collection. Copies no other data
* otherwise (but marks as having unsaved changes).
* otherwise.
*/
void add_catalogs_from_existing(const AssetCatalogCollection &other);

1
source/blender/asset_system/intern/asset_catalog.cc
View File

@@ -689,7 +689,6 @@ static void copy_catalog_map_into_existing(const OwningAssetCatalogMap &source,
void AssetCatalogCollection::add_catalogs_from_existing(const AssetCatalogCollection &other)
{
has_unsaved_changes_ = true;
copy_catalog_map_into_existing(other.catalogs_, catalogs_);
}

2
source/blender/asset_system/intern/asset_library_service.cc
View File

@@ -158,7 +158,7 @@ AssetLibrary *AssetLibraryService::get_asset_library_all(const Main *bmain)
all_library.catalog_service = std::make_unique<AssetCatalogService>(
AssetCatalogService::read_only_tag());
/* (Re-)load catalogs on refresh. */
/* (Re-)load catalogs on refresh, and merge them into the all library. */
AssetLibrary::foreach_loaded(
[&](AssetLibrary &nested) {
/* On first load the catalogs were read just above, no need to reload. */