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

Fix T74612: file browser thumbnails not showing and using CPU continuously 

This started happening after changing filter ID to 64 bit in rB2841b2be3949,
however there was a pre-existing error here in the comparison to detect updates
to filter flags.
This commit is contained in:
Brecht Van Lommel 2020-03-10 13:08:22 +01:00
parent 915998111b
commit 85cdf9a1b9
Notes: blender-bot 2023-02-14 08:42:53 +01:00 
Referenced by issue #74609, File Selector Crashes Showing Thumbnails
Referenced by issue #74612, Filebrowser does not show thumbnails
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
source/blender/editors/space_file/filelist.c
View File

@ -859,9 +859,13 @@ void filelist_setfilter_options(FileList *filelist,
filelist->filter_data.flags ^= FLF_HIDE_PARENT;
update = true;
}
if ((filelist->filter_data.filter != filter) || (filelist->filter_data.filter_id != filter_id)) {
if (filelist->filter_data.filter != filter) {
filelist->filter_data.filter = filter;
filelist->filter_data.filter_id = (filter & FILE_TYPE_BLENDERLIB) ? filter_id : FILTER_ID_ALL;
update = true;
}
const uint64_t new_filter_id = (filter & FILE_TYPE_BLENDERLIB) ? filter_id : FILTER_ID_ALL;
if (filelist->filter_data.filter_id != new_filter_id) {
filelist->filter_data.filter_id = new_filter_id;
update = true;
}
if (!STREQ(filelist->filter_data.filter_glob, filter_glob)) {