diff options
| author | Campbell Barton <campbell@blender.org> | 2022-10-17 03:30:48 +0300 |
|---|---|---|
| committer | Campbell Barton <campbell@blender.org> | 2022-10-17 03:38:54 +0300 |
| commit | 9f6a045e23cf4ab132ef78eeaf070bd53d0c509f (patch) | |
| tree | 88f3751a543626217210e45bf88732bf6635148c /source/blender/blenkernel/intern/appdir.c | |
| parent | 1d1cade9a9a7f75034669520e39c56959917803a (diff) | |
Cleanup: replace BLI_join_dirfile with BLI_path_join
These functions are almost identical, the main difference being
BLI_join_dirfile didn't trim existing slashes when joining paths
however this isn't an important difference that warrants a separate
function.
Diffstat (limited to 'source/blender/blenkernel/intern/appdir.c')
| -rw-r--r-- | source/blender/blenkernel/intern/appdir.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/blenkernel/intern/appdir.c b/source/blender/blenkernel/intern/appdir.c index 21750980b53..965f48d1e51 100644 --- a/source/blender/blenkernel/intern/appdir.c +++ b/source/blender/blenkernel/intern/appdir.c @@ -954,7 +954,7 @@ bool BKE_appdir_program_python_search(char *fullpath, if (python_bin_dir) { for (int i = 0; i < ARRAY_SIZE(python_names); i++) { - BLI_join_dirfile(fullpath, fullpath_len, python_bin_dir, python_names[i]); + BLI_path_join(fullpath, fullpath_len, python_bin_dir, python_names[i]); if ( #ifdef _WIN32 @@ -1023,7 +1023,7 @@ bool BKE_appdir_app_template_id_search(const char *app_template, char *path, siz { for (int i = 0; i < ARRAY_SIZE(app_template_directory_id); i++) { char subdir[FILE_MAX]; - BLI_join_dirfile(subdir, sizeof(subdir), app_template_directory_search[i], app_template); + BLI_path_join(subdir, sizeof(subdir), app_template_directory_search[i], app_template); if (BKE_appdir_folder_id_ex(app_template_directory_id[i], subdir, path, path_len)) { return true; } |