blender
/
blender
129
398
Fork 572
Code Issues 6.2k Pull Requests 747 Projects 19 Wiki Activity

Cleanup: avoid use of BLI_cleanup_dir 

Some cases don't need to add the trailing slash.
Use BLI_cleanup_path in this case.
This commit is contained in:
Campbell Barton 2020-03-07 00:35:55 +11:00
parent 2d5773d11a
commit 4102d67d32
Notes: blender-bot 2023-11-20 12:14:32 +01:00 
Referenced by issue #75036, Blender debug builds triggers asserts when copying pose bone.
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
source/blender/blenkernel/intern/bpath.c
View File

@ -811,7 +811,7 @@ bool BKE_bpath_relocate_visitor(void *pathbase_v, char *path_dst, const char *pa
BLI_strncpy(filepath, path_src, FILE_MAX);
if (BLI_path_abs(filepath, base_old)) {
/* Path was relative and is now absolute. Remap.
* Important BLI_cleanup_dir runs before the path is made relative
* Important BLI_cleanup_path runs before the path is made relative
* because it wont work for paths that start with "//../" */
BLI_cleanup_path(base_new, filepath);
BLI_path_rel(filepath, base_new);

2
source/blender/blenlib/intern/path_util.c
View File

@ -708,7 +708,7 @@ bool BLI_parent_dir(char *path)
char tmp[FILE_MAX + 4];
BLI_join_dirfile(tmp, sizeof(tmp), path, parent_dir);
BLI_cleanup_dir(NULL, tmp); /* does all the work of normalizing the path for us */
BLI_cleanup_path(NULL, tmp); /* does all the work of normalizing the path for us */
if (!BLI_path_extension_check(tmp, parent_dir)) {
strcpy(path, tmp); /* We assume pardir is always shorter... */

6
source/blender/blenloader/intern/writefile.c
View File

@ -4096,9 +4096,9 @@ bool BLO_write_file(Main *mainvar,
BLI_split_dir_part(mainvar->name, dir_src, sizeof(dir_src));
BLI_split_dir_part(filepath, dir_dst, sizeof(dir_dst));
/* just in case there is some subtle difference */
BLI_cleanup_dir(mainvar->name, dir_dst);
BLI_cleanup_dir(mainvar->name, dir_src);
/* Just in case there is some subtle difference. */
BLI_cleanup_path(mainvar->name, dir_dst);
BLI_cleanup_path(mainvar->name, dir_src);
if (G.relbase_valid && (BLI_path_cmp(dir_dst, dir_src) == 0)) {
/* Saved to same path. Nothing to do. */