[Bf-blender-cvs] [b999b79d087] blender-projects-basics: Support project asset libraries in new asset library loading
Julian Eisel
noreply at git.blender.org
Thu Jan 12 14:38:32 CET 2023
Commit: b999b79d087ce6633919971f37c4514421a2e60a
Author: Julian Eisel
Date: Thu Jan 12 14:37:39 2023 +0100
Branches: blender-projects-basics
https://developer.blender.org/rBb999b79d087ce6633919971f37c4514421a2e60a
Support project asset libraries in new asset library loading
===================================================================
M source/blender/asset_system/intern/asset_library_service.cc
===================================================================
diff --git a/source/blender/asset_system/intern/asset_library_service.cc b/source/blender/asset_system/intern/asset_library_service.cc
index f2e0250dde6..37ee0192f70 100644
--- a/source/blender/asset_system/intern/asset_library_service.cc
+++ b/source/blender/asset_system/intern/asset_library_service.cc
@@ -78,7 +78,8 @@ AssetLibrary *AssetLibraryService::get_asset_library(
}
case ASSET_LIBRARY_ALL:
return get_asset_library_all(bmain);
- case ASSET_LIBRARY_CUSTOM_FROM_PREFERENCES: {
+ case ASSET_LIBRARY_CUSTOM_FROM_PREFERENCES:
+ case ASSET_LIBRARY_CUSTOM_FROM_PROJECT: {
std::string root_path = root_path_from_library_ref(library_reference);
if (!root_path.empty()) {
@@ -87,7 +88,6 @@ AssetLibrary *AssetLibraryService::get_asset_library(
break;
}
}
- /* TODO project libraries */
return nullptr;
}
More information about the Bf-blender-cvs
mailing list