From 36877ce6d91c54f4ddff15dd03880fb5bd6d62f5 Mon Sep 17 00:00:00 2001 From: Julian Eisel Date: Thu, 17 Oct 2024 12:08:19 +0200 Subject: [PATCH] Fix: Essentials asset library loaded from wrong location if present Design of the essentials asset library is to treat it as part of Blender (as if it were compiled into the binary), so the location and state of these assets is clear and can be assumed in code. User edits are not expected. Because of that we should only look for this asset library in the installation ("system") location, not in the user configuration which would take priority if present. On some devs machines this location would actually be present, making the essentials unavailable and causing confusing/misleading warning prints, see #128420. --- .../blender/asset_system/intern/asset_library_essentials.cc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/source/blender/asset_system/intern/asset_library_essentials.cc b/source/blender/asset_system/intern/asset_library_essentials.cc index 367f6c88226..22d83997ed3 100644 --- a/source/blender/asset_system/intern/asset_library_essentials.cc +++ b/source/blender/asset_system/intern/asset_library_essentials.cc @@ -26,8 +26,8 @@ EssentialsAssetLibrary::EssentialsAssetLibrary() StringRefNull essentials_directory_path() { static std::string path = []() { - const std::optional datafiles_path = BKE_appdir_folder_id(BLENDER_DATAFILES, - "assets"); + const std::optional datafiles_path = BKE_appdir_folder_id( + BLENDER_SYSTEM_DATAFILES, "assets"); return datafiles_path.value_or(""); }(); return path;