archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

Fix Filebrowser Blender ID filter

Browse Source 
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:
Dalai Felinto
2019-10-09 16:39:00 -03:00
parent a9fbd05e7d
commit 9100982e80
3 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -831,7 +831,7 @@ void filelist_setfilter_options(FileList *filelist,
} }
if ((filelist->filter_data.filter != filter) || (filelist->filter_data.filter_id != filter_id)) { if ((filelist->filter_data.filter != filter) || (filelist->filter_data.filter_id != filter_id)) {
filelist->filter_data.filter = filter; 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; update = true;
} }
if (!STREQ(filelist->filter_data.filter_glob, filter_glob)) { if (!STREQ(filelist->filter_data.filter_glob, filter_glob)) {

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

@@ -247,13 +247,7 @@ short ED_fileselect_set_params(SpaceFile *sfile)
} }
/* For now, always init filterid to 'all true' */ /* 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 | params->filter_id = FILTER_ID_ALL;
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;
if (U.uiflag & USER_HIDE_DOT) { if (U.uiflag & USER_HIDE_DOT) {
params->flag |= FILE_HIDE_DOT; params->flag |= FILE_HIDE_DOT;

7
source/blender/makesdna/DNA_ID.h
View File

@@ -697,6 +697,13 @@ enum {
FILTER_ID_LP = (1u << 31), 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, /* IMPORTANT: this enum matches the order currently use in set_listbasepointers,
* keep them in sync! */ * keep them in sync! */
enum { enum {