Xylvier/blender
0
0
Fork 0
forked from blender/blender
Code Pull Requests Activity

main sync #3

Merged
Patrick Busch merged 318 commits from blender/blender:main into main 2023-03-17 15:52:21 +01:00
Conversation 0 Commits 318 Files Changed 1069 +2 -3
2 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit cb20f2cbf9 - Show all commits

1
source/blender/asset_system/CMakeLists.txt
View File

@ -5,7 +5,6 @@ set(INC
intern intern
../blenkernel ../blenkernel
../blenlib ../blenlib
../blenloader
../makesdna ../makesdna
../../../intern/clog ../../../intern/clog
../../../intern/guardedalloc ../../../intern/guardedalloc

4
source/blender/asset_system/intern/asset_identifier.cc
View File

@ -6,7 +6,7 @@
#include <string> #include <string>
#include "BLO_readfile.h" #include "BKE_blendfile.h"
#include "BLI_path_util.h" #include "BLI_path_util.h"
@ -32,7 +32,7 @@ std::string AssetIdentifier::full_library_path() const
std::string asset_path = full_path(); std::string asset_path = full_path();
char blend_path[1090 /*FILE_MAX_LIBEXTRA*/]; char blend_path[1090 /*FILE_MAX_LIBEXTRA*/];
if (!BLO_library_path_explode(asset_path.c_str(), blend_path, nullptr, nullptr)) { if (!BKE_library_path_explode(asset_path.c_str(), blend_path, nullptr, nullptr)) {
return {}; return {};
} }