diff options
| author | Brecht Van Lommel <brecht> | 2020-03-03 19:21:28 +0300 |
|---|---|---|
| committer | Brecht Van Lommel <brecht@blender.org> | 2020-03-03 19:34:21 +0300 |
| commit | 2841b2be3949b7592b50cd2ebd03b9b32a5f2058 (patch) | |
| tree | 36b583a61bdf14150b8061d3f349610d781696de /source/blender/editors/space_file/filelist.c | |
| parent | 19785b96c43f6dc19906f4b39a18a656684826b1 (diff) | |
IDs: change FILTER_ID_* to 64 bit to make space for new ID types
And change file browser to boolean from bitflag enum, which is only 32 bit.
Differential Revision: https://developer.blender.org/D7004
Diffstat (limited to 'source/blender/editors/space_file/filelist.c')
| -rw-r--r-- | source/blender/editors/space_file/filelist.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/source/blender/editors/space_file/filelist.c b/source/blender/editors/space_file/filelist.c index 9defff74c6f..11304d6ae46 100644 --- a/source/blender/editors/space_file/filelist.c +++ b/source/blender/editors/space_file/filelist.c @@ -269,8 +269,8 @@ typedef struct FileListEntryPreview { } FileListEntryPreview; typedef struct FileListFilter { - unsigned int filter; - unsigned int filter_id; + uint64_t filter; + uint64_t filter_id; char filter_glob[FILE_MAXFILE]; char filter_search[66]; /* + 2 for heading/trailing implicit '*' wildcards. */ short flags; @@ -361,7 +361,7 @@ static void filelist_readjob_dir( /* helper, could probably go in BKE actually? */ static int groupname_to_code(const char *group); -static unsigned int groupname_to_filter_id(const char *group); +static uint64_t groupname_to_filter_id(const char *group); static void filelist_filter_clear(FileList *filelist); static void filelist_cache_clear(FileListEntryCache *cache, size_t new_size); @@ -746,7 +746,7 @@ static bool is_filtered_lib(FileListInternEntry *file, const char *root, FileLis is_filtered = false; } else { - unsigned int filter_id = groupname_to_filter_id(group); + uint64_t filter_id = groupname_to_filter_id(group); if (!(filter_id & filter->filter_id)) { is_filtered = false; } @@ -835,8 +835,8 @@ void filelist_setfilter_options(FileList *filelist, const bool do_filter, const bool hide_dot, const bool hide_parent, - const unsigned int filter, - const unsigned int filter_id, + const uint64_t filter, + const uint64_t filter_id, const char *filter_glob, const char *filter_search) { @@ -2422,7 +2422,7 @@ static int groupname_to_code(const char *group) return buf[0] ? BKE_idcode_from_name(buf) : 0; } -static unsigned int groupname_to_filter_id(const char *group) +static uint64_t groupname_to_filter_id(const char *group) { int id_code = groupname_to_code(group); |