diff options
| author | Martijn Versteegh <blender@aaltjegron.nl> | 2022-11-11 21:44:16 +0300 |
|---|---|---|
| committer | Martijn Versteegh <blender@aaltjegron.nl> | 2022-11-11 21:44:16 +0300 |
| commit | b4757873bf1c2fb5e3f858a085af62359d3c1b3f (patch) | |
| tree | 98d4407723ef2816334d06cd79388c0d7b2d708c /source/blender/blenkernel/intern/asset_catalog.cc | |
| parent | 62effd6791858221392ff7b92104a22ed44ebf7d (diff) | |
| parent | 2c596319a4888aa40bfdf41f9ea5d446179141d0 (diff) | |
Merge branch 'master' into refactor-mesh-uv-map-generic
Diffstat (limited to 'source/blender/blenkernel/intern/asset_catalog.cc')
| -rw-r--r-- | source/blender/blenkernel/intern/asset_catalog.cc | 9 |
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; } |