[Bf-blender-cvs] [21f13ff9cb8] temp-asset-browser-catalogs-ui: Merge branch 'temp-asset-browser-catalogs' into temp-asset-browser-catalogs-ui

[Julian Eisel]

Commit: 21f13ff9cb88226c00b531ab7d663a77cbd16a72
Author: Julian Eisel
Date:   Mon Sep 20 00:08:28 2021 +0200
Branches: temp-asset-browser-catalogs-ui
https://developer.blender.org/rB21f13ff9cb88226c00b531ab7d663a77cbd16a72

Merge branch 'temp-asset-browser-catalogs' into temp-asset-browser-catalogs-ui

===================================================================



===================================================================

diff --cc source/blender/editors/space_file/filesel.c
index feb8538c02b,11b06d2b414..1a068a5055f
--- a/source/blender/editors/space_file/filesel.c
+++ b/source/blender/editors/space_file/filesel.c
@@@ -129,10 -129,14 +129,11 @@@ static void fileselect_ensure_updated_a
    base_params->flag |= U_default.file_space_data.flag | FILE_ASSETS_ONLY | FILE_FILTER;
    base_params->flag &= ~FILE_DIRSEL_ONLY;
    base_params->filter |= FILE_TYPE_BLENDERLIB;
 -  base_params->filter_id = FILTER_ID_OB | FILTER_ID_GR;
 +  base_params->filter_id = FILTER_ID_ALL;
    base_params->display = FILE_IMGDISPLAY;
    base_params->sort = FILE_SORT_ALPHA;
-   base_params->recursion_level = 1;
+   /* Asset libraries include all sub-directories, so enable maximal recursion. */
+   base_params->recursion_level = FILE_SELECT_MAX_RECURSIONS;
    /* 'SMALL' size by default. More reasonable since this is typically used as regular editor,
     * space is more of an issue here. */
    base_params->thumbnail_size = 96;