griefith/test
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Cleanup: rename main_name to main_filepath

Browse Source 
It wasn't clear this is a file-path, previous name was left over from
when the blend files path was called `name`.
This commit is contained in:
Campbell Barton
2023-04-24 12:11:40 +10:00
parent 6ab225074d
commit 20eb682967
1 changed files with 13 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -2916,7 +2916,7 @@ struct TodoDir {
struct FileListReadJob {
ThreadMutex lock;
char main_name[FILE_MAX];
char main_filepath[FILE_MAX];
Main *current_main;
FileList *filelist;
@@ -2981,7 +2981,7 @@ static int filelist_readjob_list_dir(FileListReadJob *job_params,
ListBase *entries,
const char *filter_glob,
const bool do_lib,
const char *main_name,
const char *main_filepath,
const bool skip_currpar)
{
direntry *files;
@@ -3045,7 +3045,7 @@ static int filelist_readjob_list_dir(FileListReadJob *job_params,
/* If we are considering .blend files as libraries, promote them to directory status. */
entry->typeflag = FILE_TYPE_BLENDER;
/* prevent current file being used as acceptable dir */
if (BLI_path_cmp(main_name, target) != 0) {
if (BLI_path_cmp(main_filepath, target) != 0) {
entry->typeflag |= FILE_TYPE_DIR;
}
}
@@ -3586,7 +3586,7 @@ static void filelist_readjob_recursive_dir_add_items(const bool do_lib,
BLI_strncpy(dir, filelist->filelist.root, sizeof(dir));
BLI_strncpy(filter_glob, filelist->filter_data.filter_glob, sizeof(filter_glob));
BLI_path_normalize_dir(job_params->main_name, dir, sizeof(dir));
BLI_path_normalize_dir(job_params->main_filepath, dir, sizeof(dir));
td_dir->dir = BLI_strdup(dir);
/* Init the file indexer. */
@@ -3649,8 +3649,13 @@ static void filelist_readjob_recursive_dir_add_items(const bool do_lib,
}
if (!is_lib && BLI_is_dir(subdir)) {
entries_num = filelist_readjob_list_dir(
job_params, subdir, &entries, filter_glob, do_lib, job_params->main_name, skip_currpar);
entries_num = filelist_readjob_list_dir(job_params,
subdir,
&entries,
filter_glob,
do_lib,
job_params->main_filepath,
skip_currpar);
}
LISTBASE_FOREACH (FileListInternEntry *, entry, &entries) {
@@ -3663,7 +3668,7 @@ static void filelist_readjob_recursive_dir_add_items(const bool do_lib,
/* We have a directory we want to list, add it to todo list!
* Using #BLI_path_join works but isn't needed as `root` has a trailing slash. */
BLI_string_join(dir, sizeof(dir), root, entry->relpath);
BLI_path_normalize_dir(job_params->main_name, dir, sizeof(dir));
BLI_path_normalize_dir(job_params->main_filepath, dir, sizeof(dir));
td_dir = static_cast<TodoDir *>(BLI_stack_push_r(todo_dirs));
td_dir->level = recursion_level + 1;
td_dir->dir = BLI_strdup(dir);
@@ -4088,7 +4093,7 @@ void filelist_readjob_start(FileList *filelist, const int space_notifier, const
flrj = MEM_cnew<FileListReadJob>(__func__);
flrj->filelist = filelist;
flrj->current_main = bmain;
BLI_strncpy(flrj->main_name, BKE_main_blendfile_path(bmain), sizeof(flrj->main_name));
BLI_strncpy(flrj->main_filepath, BKE_main_blendfile_path(bmain), sizeof(flrj->main_filepath));
if ((filelist->flags & FL_FORCE_RESET_MAIN_FILES) && !(filelist->flags & FL_FORCE_RESET)) {
flrj->only_main_data = true;
}