[Bf-blender-cvs] [e6f522cecf8] asset-browser: Merge branch 'temp-review-asset-filelists' into temp-review-asset-browser-ui

[Julian Eisel]

Commit: e6f522cecf8a7ba43ec1c2303c84e924ae18bd3a
Author: Julian Eisel
Date:   Thu Dec 10 18:05:34 2020 +0100
Branches: asset-browser
https://developer.blender.org/rBe6f522cecf8a7ba43ec1c2303c84e924ae18bd3a

Merge branch 'temp-review-asset-filelists' into temp-review-asset-browser-ui

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



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

diff --cc source/blender/editors/space_file/space_file.c
index 6284f5ffe13,3188cedaee5..fd4d7e10614
--- a/source/blender/editors/space_file/space_file.c
+++ b/source/blender/editors/space_file/space_file.c
@@@ -808,10 -781,8 +841,11 @@@ void ED_spacetype_file(void
    st->operatortypes = file_operatortypes;
    st->keymap = file_keymap;
    st->dropboxes = file_dropboxes;
 +  st->space_subtype_item_extend = file_space_subtype_item_extend;
 +  st->space_subtype_get = file_space_subtype_get;
 +  st->space_subtype_set = file_space_subtype_set;
    st->context = file_context;
+   st->id_remap = file_id_remap;
  
    /* regions: main window */
    art = MEM_callocN(sizeof(ARegionType), "spacetype file region");