diff options
author | Colin Basnett <cmbasnett@gmail.com> | 2022-09-17 03:50:37 +0300 |
---|---|---|
committer | Colin Basnett <cmbasnett@gmail.com> | 2022-09-17 03:50:37 +0300 |
commit | 564bda241a973396da51d7c3ccd9efd97d51728a (patch) | |
tree | 4d9aa4cccd82e2e606b47774afa5e1015bf14768 /source/blender/editors/space_file/filelist.c | |
parent | 0fff238150d076576053c25b646f653d6e3b0edb (diff) | |
parent | 48d7ff68f0df209c77bbb081ab46fbc109fd825a (diff) |
Merge branch 'master' into feature-imformatfeature-imformat
Diffstat (limited to 'source/blender/editors/space_file/filelist.c')
-rw-r--r-- | source/blender/editors/space_file/filelist.c | 19 |
1 files changed, 12 insertions, 7 deletions
diff --git a/source/blender/editors/space_file/filelist.c b/source/blender/editors/space_file/filelist.c index 183af0c14f5..24e1faaf4c9 100644 --- a/source/blender/editors/space_file/filelist.c +++ b/source/blender/editors/space_file/filelist.c @@ -485,6 +485,7 @@ static int groupname_to_code(const char *group); static uint64_t groupname_to_filter_id(const char *group); static void filelist_cache_clear(FileListEntryCache *cache, size_t new_size); +static bool filelist_intern_entry_is_main_file(const FileListInternEntry *intern_entry); /* ********** Sort helpers ********** */ @@ -1025,13 +1026,6 @@ static bool is_filtered_lib(FileListInternEntry *file, const char *root, FileLis return is_filtered_lib_type(file, root, filter) && is_filtered_file_relpath(file, filter); } -static bool is_filtered_asset_library(FileListInternEntry *file, - const char *root, - FileListFilter *filter) -{ - return is_filtered_lib_type(file, root, filter) && is_filtered_asset(file, filter); -} - static bool is_filtered_main(FileListInternEntry *file, const char *UNUSED(dir), FileListFilter *filter) @@ -1048,6 +1042,17 @@ static bool is_filtered_main_assets(FileListInternEntry *file, is_filtered_asset(file, filter); } +static bool is_filtered_asset_library(FileListInternEntry *file, + const char *root, + FileListFilter *filter) +{ + if (filelist_intern_entry_is_main_file(file)) { + return is_filtered_main_assets(file, root, filter); + } + + return is_filtered_lib_type(file, root, filter) && is_filtered_asset(file, filter); +} + void filelist_tag_needs_filtering(FileList *filelist) { filelist->flags |= FL_NEED_FILTERING; |