Commit: 55512dd2a8e4c4b2b91f187f4eafd867fb60b8df Author: Julian Eisel Date: Tue Oct 18 11:49:50 2022 +0200 Branches: blender-projects-basics https://developer.blender.org/rB55512dd2a8e4c4b2b91f187f4eafd867fb60b8df
Update to path changes in master =================================================================== M source/blender/editors/asset/intern/asset_list.cc M source/blender/editors/space_file/filesel.c =================================================================== diff --git a/source/blender/editors/asset/intern/asset_list.cc b/source/blender/editors/asset/intern/asset_list.cc index c279a4d31bd..b641c9d6ffc 100644 --- a/source/blender/editors/asset/intern/asset_list.cc +++ b/source/blender/editors/asset/intern/asset_list.cc @@ -162,7 +162,7 @@ void AssetList::setup() BLI_path_is_rel(custom_library->path)) { BlenderProject *project = CTX_wm_project(); const char *project_root_path = BKE_project_root_path_get(project); - BLI_path_join(path, sizeof(path), project_root_path, custom_library->path, NULL); + BLI_path_join(path, sizeof(path), project_root_path, custom_library->path); } else { BLI_strncpy(path, custom_library->path, sizeof(path)); diff --git a/source/blender/editors/space_file/filesel.c b/source/blender/editors/space_file/filesel.c index 37f341db163..8f419d256e5 100644 --- a/source/blender/editors/space_file/filesel.c +++ b/source/blender/editors/space_file/filesel.c @@ -436,11 +436,8 @@ static void fileselect_refresh_asset_params(FileAssetSelectParams *asset_params) if (BLI_path_is_rel(custom_library->path)) { const char *project_root_path = BKE_project_root_path_get(project); - BLI_path_join(base_params->dir, - sizeof(base_params->dir), - project_root_path, - custom_library->path, - NULL); + BLI_path_join( + base_params->dir, sizeof(base_params->dir), project_root_path, custom_library->path); } else { BLI_strncpy(base_params->dir, custom_library->path, sizeof(base_params->dir)); _______________________________________________ Bf-blender-cvs mailing list Bf-blender-cvs@blender.org List details, subscription details or unsubscribe: https://lists.blender.org/mailman/listinfo/bf-blender-cvs