From cb20f2cbf993737db5201a3e8cb4c4588ef608e4 Mon Sep 17 00:00:00 2001 From: Julian Eisel Date: Thu, 16 Mar 2023 15:27:27 +0100 Subject: [PATCH] Fix build error after previous merge Function was moved and renamed in 48814c25fd. --- source/blender/asset_system/CMakeLists.txt | 1 - source/blender/asset_system/intern/asset_identifier.cc | 4 ++-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/source/blender/asset_system/CMakeLists.txt b/source/blender/asset_system/CMakeLists.txt index f078f350655..25b00e54e71 100644 --- a/source/blender/asset_system/CMakeLists.txt +++ b/source/blender/asset_system/CMakeLists.txt @@ -5,7 +5,6 @@ set(INC intern ../blenkernel ../blenlib - ../blenloader ../makesdna ../../../intern/clog ../../../intern/guardedalloc diff --git a/source/blender/asset_system/intern/asset_identifier.cc b/source/blender/asset_system/intern/asset_identifier.cc index 8464457edbd..7f36f2d7617 100644 --- a/source/blender/asset_system/intern/asset_identifier.cc +++ b/source/blender/asset_system/intern/asset_identifier.cc @@ -6,7 +6,7 @@ #include -#include "BLO_readfile.h" +#include "BKE_blendfile.h" #include "BLI_path_util.h" @@ -32,7 +32,7 @@ std::string AssetIdentifier::full_library_path() const std::string asset_path = full_path(); 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 {}; }