diff options
| author | Brecht Van Lommel <brecht@blender.org> | 2020-03-10 15:08:22 +0300 |
|---|---|---|
| committer | Brecht Van Lommel <brecht@blender.org> | 2020-03-10 15:11:32 +0300 |
| commit | 85cdf9a1b9e8e47997d92e45657975a0a053de68 (patch) | |
| tree | 3e7667385cffc4067561b0fc185b8cae9ca3ab69 /source/blender/editors/space_file | |
| parent | 915998111bc45336247a7aaf91eaa1dcd5e8881b (diff) | |
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.
Diffstat (limited to 'source/blender/editors/space_file')
| -rw-r--r-- | source/blender/editors/space_file/filelist.c | 8 |
1 files changed, 6 insertions, 2 deletions
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)) { |