diff options
author | Sybren A. Stüvel <sybren@blender.org> | 2021-11-12 12:52:12 +0300 |
---|---|---|
committer | Sybren A. Stüvel <sybren@blender.org> | 2021-11-12 12:52:12 +0300 |
commit | 26502f3d897f3cf337e2fbf614da9232360a95fd (patch) | |
tree | e078a7f76903075e72451d37cde2a01b4ba486a2 /source/blender/editors/space_file/filelist.c | |
parent | 86ca206db8d1a196e4361834b2241d747b8ce493 (diff) | |
parent | 2b633f12adfa759fc81a61e5ec699be29b756267 (diff) |
Merge remote-tracking branch 'origin/blender-v3.0-release'
Diffstat (limited to 'source/blender/editors/space_file/filelist.c')
-rw-r--r-- | source/blender/editors/space_file/filelist.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/source/blender/editors/space_file/filelist.c b/source/blender/editors/space_file/filelist.c index a73fa2b9740..5d1a202e5ca 100644 --- a/source/blender/editors/space_file/filelist.c +++ b/source/blender/editors/space_file/filelist.c @@ -914,6 +914,9 @@ static void prepare_filter_asset_library(const FileList *filelist, FileListFilte if (!filter->asset_catalog_filter) { return; } + BLI_assert_msg(filelist->asset_library, + "prepare_filter_asset_library() should only be called when the file browser is " + "in asset browser mode"); file_ensure_updated_catalog_filter_data(filter->asset_catalog_filter, filelist->asset_library); } @@ -1876,11 +1879,13 @@ void filelist_settype(FileList *filelist, short type) case FILE_MAIN: filelist->check_dir_fn = filelist_checkdir_main; filelist->read_job_fn = filelist_readjob_main; + filelist->prepare_filter_fn = NULL; filelist->filter_fn = is_filtered_main; break; case FILE_LOADLIB: filelist->check_dir_fn = filelist_checkdir_lib; filelist->read_job_fn = filelist_readjob_lib; + filelist->prepare_filter_fn = NULL; filelist->filter_fn = is_filtered_lib; break; case FILE_ASSET_LIBRARY: @@ -1900,6 +1905,7 @@ void filelist_settype(FileList *filelist, short type) default: filelist->check_dir_fn = filelist_checkdir_dir; filelist->read_job_fn = filelist_readjob_dir; + filelist->prepare_filter_fn = NULL; filelist->filter_fn = is_filtered_file; break; } |