Merge branch 'master' into temp-sculpt-roll-mappingtemp-sculpt-roll-mapping

1 files changed, 4 insertions, 5 deletions

diff --git a/source/blender/blenkernel/intern/asset_catalog.cc b/source/blender/blenkernel/intern/asset_catalog.cc
index 62d03b2d79b..a9fe59eba64 100644
--- a/source/blender/blenkernel/intern/asset_catalog.cc
+++ b/source/blender/blenkernel/intern/asset_catalog.cc
@@ -508,14 +508,13 @@ CatalogFilePath AssetCatalogService::find_suitable_cdf_path_for_writing(
                  "catalog definition file should be put");
 
   /* Ask the asset library API for an appropriate location. */
-  char suitable_root_path[PATH_MAX];
-  const bool asset_lib_root_found = BKE_asset_library_find_suitable_root_path_from_path(
-      blend_file_path.c_str(), suitable_root_path);
-  if (asset_lib_root_found) {
+  const std::string suitable_root_path = BKE_asset_library_find_suitable_root_path_from_path(
+      blend_file_path);
+  if (!suitable_root_path.empty()) {
     char asset_lib_cdf_path[PATH_MAX];
     BLI_path_join(asset_lib_cdf_path,
                   sizeof(asset_lib_cdf_path),
-                  suitable_root_path,
+                  suitable_root_path.c_str(),
                   DEFAULT_CATALOG_FILENAME.c_str());
     return asset_lib_cdf_path;
   }