Fix Filebrowser Blender ID filter
When the filtering option was disable we should see all the datablock types. Differential Revision: https://developer.blender.org/D6033
This commit is contained in:
parent
a9fbd05e7d
commit
9100982e80
Notes:
blender-bot
2023-04-19 22:54:54 +02:00
Referenced by commit7c1fbe24ca
, Fix T71019: Disappearing file thumbnails & crash on area split Referenced by commit74c9a4769e
, Fix: Some ID-Filters not enabled on Link/Append Referenced by commita6b9e1dfdb
, Fix: Some ID-Filters not enabled on Link/Append Referenced by issue #71019, Thumbnails in Filebrowser disappearing, Splitting the Filebrowser Area Window chrashes Blender
|
@ -831,7 +831,7 @@ void filelist_setfilter_options(FileList *filelist,
|
|||
}
|
||||
if ((filelist->filter_data.filter != filter) || (filelist->filter_data.filter_id != filter_id)) {
|
||||
filelist->filter_data.filter = filter;
|
||||
filelist->filter_data.filter_id = filter_id;
|
||||
filelist->filter_data.filter_id = (filter & FILE_TYPE_BLENDERLIB) ? filter_id : FILTER_ID_ALL;
|
||||
update = true;
|
||||
}
|
||||
if (!STREQ(filelist->filter_data.filter_glob, filter_glob)) {
|
||||
|
|
|
@ -247,13 +247,7 @@ short ED_fileselect_set_params(SpaceFile *sfile)
|
|||
}
|
||||
|
||||
/* For now, always init filterid to 'all true' */
|
||||
params->filter_id = FILTER_ID_AC | FILTER_ID_AR | FILTER_ID_BR | FILTER_ID_CA | FILTER_ID_CU |
|
||||
FILTER_ID_GD | FILTER_ID_GR | FILTER_ID_IM | FILTER_ID_LA | FILTER_ID_LS |
|
||||
FILTER_ID_LT | FILTER_ID_MA | FILTER_ID_MB | FILTER_ID_MC | FILTER_ID_ME |
|
||||
FILTER_ID_MSK | FILTER_ID_NT | FILTER_ID_OB | FILTER_ID_PA |
|
||||
FILTER_ID_PAL | FILTER_ID_PC | FILTER_ID_SCE | FILTER_ID_SPK |
|
||||
FILTER_ID_SO | FILTER_ID_TE | FILTER_ID_TXT | FILTER_ID_VF | FILTER_ID_WO |
|
||||
FILTER_ID_CF | FILTER_ID_WS | FILTER_ID_LP;
|
||||
params->filter_id = FILTER_ID_ALL;
|
||||
|
||||
if (U.uiflag & USER_HIDE_DOT) {
|
||||
params->flag |= FILE_HIDE_DOT;
|
||||
|
|
|
@ -697,6 +697,13 @@ enum {
|
|||
FILTER_ID_LP = (1u << 31),
|
||||
};
|
||||
|
||||
#define FILTER_ID_ALL \
|
||||
(FILTER_ID_AC | FILTER_ID_AR | FILTER_ID_BR | FILTER_ID_CA | FILTER_ID_CU | FILTER_ID_GD | \
|
||||
FILTER_ID_LS | FILTER_ID_LT | FILTER_ID_MA | FILTER_ID_MB | FILTER_ID_MC | FILTER_ID_ME | \
|
||||
FILTER_ID_MSK | FILTER_ID_NT | FILTER_ID_OB | FILTER_ID_PA | FILTER_ID_PAL | FILTER_ID_PC | \
|
||||
FILTER_ID_SCE | FILTER_ID_SPK | FILTER_ID_SO | FILTER_ID_TE | FILTER_ID_TXT | FILTER_ID_VF | \
|
||||
FILTER_ID_WO | FILTER_ID_CF | FILTER_ID_WS | FILTER_ID_LP)
|
||||
|
||||
/* IMPORTANT: this enum matches the order currently use in set_listbasepointers,
|
||||
* keep them in sync! */
|
||||
enum {
|
||||
|
|
Loading…
Reference in New Issue