diff options
author | Campbell Barton <ideasman42@gmail.com> | 2020-03-07 05:49:58 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2020-03-07 05:52:41 +0300 |
commit | ef5c6361a57acfb86de3b137581c968b769e3383 (patch) | |
tree | 0d9cc22d483493206637176dd2896ac02fa483c0 /source/blender/editors/space_file/file_draw.c | |
parent | 0964865568802aba62737d899d6721ef5c58b63a (diff) |
Cleanup: replace BLI_make_file_string with BLI_join_dirfile for the file-selector
In these cases the file selectors directory is already expanded.
Diffstat (limited to 'source/blender/editors/space_file/file_draw.c')
-rw-r--r-- | source/blender/editors/space_file/file_draw.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/source/blender/editors/space_file/file_draw.c b/source/blender/editors/space_file/file_draw.c index 10c56901eca..a215909fad4 100644 --- a/source/blender/editors/space_file/file_draw.c +++ b/source/blender/editors/space_file/file_draw.c @@ -386,11 +386,10 @@ static void renamebutton_cb(bContext *C, void *UNUSED(arg1), char *oldname) ScrArea *sa = CTX_wm_area(C); ARegion *region = CTX_wm_region(C); - const char *blendfile_path = BKE_main_blendfile_path(bmain); - BLI_make_file_string(blendfile_path, orgname, sfile->params->dir, oldname); + BLI_join_dirfile(orgname, sizeof(orgname), sfile->params->dir, oldname); BLI_strncpy(filename, sfile->params->renamefile, sizeof(filename)); BLI_filename_make_safe(filename); - BLI_make_file_string(blendfile_path, newname, sfile->params->dir, filename); + BLI_join_dirfile(newname, sizeof(newname), sfile->params->dir, filename); if (!STREQ(orgname, newname)) { if (!BLI_exists(newname)) { |