Commit: 03bd43717027ef4318c30edf611e4f32d94f1a95
Author: Julian Eisel
Date: Wed Nov 30 19:49:29 2022 +0100
Branches: temp-asset-library-all
https://developer.blender.org/rB03bd43717027ef4318c30edf611e4f32d94f1a95
Merge branch 'master' into temp-asset-library-all
===================================================================
===================================================================
diff --cc source/blender/asset_system/intern/asset_library.cc
index 79c3c55029c,2f3b56d226a..043d1a45ef2
--- a/source/blender/asset_system/intern/asset_library.cc
+++ b/source/blender/asset_system/intern/asset_library.cc
@@@ -249,7 -235,11 +253,12 @@@ void AssetLibrary::refresh_catalog_simp
STRNCPY(asset_data->catalog_simple_name, catalog->simple_name.c_str());
}
+ StringRefNull AssetLibrary::root_path() const
+ {
+ return *root_path_;
+ }
+
+/* TODO get rid of this. */
Vector<AssetLibraryReference> all_valid_asset_library_refs()
{
Vector<AssetLibraryReference> result;
diff --cc source/blender/asset_system/intern/asset_storage.hh
index 0814c258442,2b4614abca5..b4866fa9382
--- a/source/blender/asset_system/intern/asset_storage.hh
+++ b/source/blender/asset_system/intern/asset_storage.hh
@@@ -30,13 -31,13 +31,15 @@@ class AssetStorage
* faster lookups. Not possible until each asset is only represented once
in the storage. */
StorageT local_id_assets_;
+ friend class AssetLibrary;
+
public:
/** See #AssetLibrary::add_external_asset(). */
- AssetRepresentation &add_external_asset(StringRef name,
std::unique_ptr<AssetMetaData> metadata);
+ AssetRepresentation &add_external_asset(AssetIdentifier &&identifier,
+ StringRef name,
+ std::unique_ptr<AssetMetaData>
metadata);
/** See #AssetLibrary::add_external_asset(). */
- AssetRepresentation &add_local_id_asset(ID &id);
+ AssetRepresentation &add_local_id_asset(AssetIdentifier &&identifier, ID
&id);
/** See #AssetLibrary::remove_asset(). */
bool remove_asset(AssetRepresentation &asset);
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
List details, subscription details or unsubscribe:
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
