Commit: 85cdf9a1b9e8e47997d92e45657975a0a053de68
Author: Brecht Van Lommel
Date: Tue Mar 10 13:08:22 2020 +0100
Branches: master
https://developer.blender.org/rB85cdf9a1b9e8e47997d92e45657975a0a053de68
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.
===================================================================
M source/blender/editors/space_file/filelist.c
===================================================================
diff --git a/source/blender/editors/space_file/filelist.c
b/source/blender/editors/space_file/filelist.c
index 52db0d1852d..903698b1ace 100644
--- a/source/blender/editors/space_file/filelist.c
+++ b/source/blender/editors/space_file/filelist.c
@@ -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)) {
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
