blender
/
blender
136
407
Fork 590
Code Issues 6.3k Pull Requests 780 Projects 19 Wiki Activity

Refactor: Reduce File Browser Sorting #119103

Closed
Harley Acheson wants to merge 3 commits from Harley/blender:FileSorting into main
pull from: Harley/blender:FileSorting
merge into: blender:main

When changing the target branch, be careful to rebase the branch in your fork to match. See documentation.
Conversation 3 Commits 3 Files Changed 2 +4 -4
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
source/blender/blenlib/intern/BLI_filelist.cc
View File

@ -143,7 +143,7 @@ static void bli_builddir(BuildDirCtx *dir_ctx, const char *dirname)
else if (FILENAME_IS_CURRENT(dlink->name)) {
has_current = true;
}
BLI_addhead(&dirbase, dlink);
BLI_addtail(&dirbase, dlink);
newnum++;
}
}
@ -156,7 +156,7 @@ static void bli_builddir(BuildDirCtx *dir_ctx, const char *dirname)
dirlink *const dlink = (dirlink *)malloc(sizeof(dirlink));
if (dlink != nullptr) {
dlink->name = BLI_strdup(FILENAME_PARENT);
BLI_addhead(&dirbase, dlink);
BLI_addtail(&dirbase, dlink);
newnum++;
}
}
@ -165,7 +165,7 @@ static void bli_builddir(BuildDirCtx *dir_ctx, const char *dirname)
dirlink *const dlink = (dirlink *)malloc(sizeof(dirlink));
if (dlink != nullptr) {
dlink->name = BLI_strdup(FILENAME_CURRENT);
BLI_addhead(&dirbase, dlink);
BLI_addtail(&dirbase, dlink);
newnum++;
}
}

2
source/blender/editors/space_file/filelist.cc
View File

@ -3135,7 +3135,7 @@ static int filelist_readjob_list_dir(FileListReadJob *job_params,
}
#endif
BLI_addtail(entries, entry);
BLI_addhead(entries, entry);
entries_num++;
Harley marked this conversation as resolved Outdated
Hans Goudey commented 2024-03-06 16:48:49 +01:00
Outdated
Review
Copy Link

It looks like moving the if (files) check is an unrelated cleanup? The diff would be clearer without that.

It looks like moving the `if (files)` check is an unrelated cleanup? The diff would be clearer without that.
}
BLI_filelist_free(files, files_num);