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

Merge branch 'blender-v4.4-release'

Browse Source
This commit is contained in:
Harley Acheson
2025-03-04 09:12:00 -08:00
parent a2386789da 84123446e3
commit d71ce31122
1 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1500,7 +1500,9 @@ static int filelist_intern_free_main_files(FileList *filelist)
removed_counter++;
}
MEM_SAFE_FREE(filelist_intern->filtered);
if (removed_counter > 0) {
MEM_SAFE_FREE(filelist_intern->filtered);
}
return removed_counter;
}
@@ -1916,6 +1918,11 @@ static void filelist_clear_main_files(FileList *filelist,
if (filelist->filelist.entries_num == FILEDIR_NBR_ENTRIES_UNSET) {
return;
}
const int removed_files = filelist_intern_free_main_files(filelist);
/* File list contains no main files to clear. */
if (removed_files == 0) {
return;
}
filelist_tag_needs_filtering(filelist);
@@ -1923,8 +1930,6 @@ static void filelist_clear_main_files(FileList *filelist,
filelist_cache_clear(&filelist->filelist_cache, filelist->filelist_cache.size);
}
const int removed_files = filelist_intern_free_main_files(filelist);
filelist->filelist.entries_num -= removed_files;
filelist->filelist.entries_filtered_num = FILEDIR_NBR_ENTRIES_UNSET;
BLI_assert(filelist->filelist.entries_num > FILEDIR_NBR_ENTRIES_UNSET);