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.
This commit is contained in:
2022-10-17 11:30:48 +11:00
parent 1d1cade9a9
commit 9f6a045e23
61 changed files with 120 additions and 175 deletions

View File

@@ -1325,7 +1325,7 @@ static ImBuf *icon_preview_imbuf_from_brush(Brush *brush)
const char *brushicons_dir = BKE_appdir_folder_id(BLENDER_DATAFILES, "brushicons");
/* Expected to be found, but don't crash if it's not. */
if (brushicons_dir) {
BLI_join_dirfile(filepath, sizeof(filepath), brushicons_dir, brush->icon_filepath);
BLI_path_join(filepath, sizeof(filepath), brushicons_dir, brush->icon_filepath);
/* Use default color spaces. */
brush->icon_imbuf = IMB_loadiffname(filepath, flags, nullptr);