[Bf-blender-cvs] [22580aff76d] asset-browser-grid-view: Merge branch 'master' into asset-browser-grid-view

[Julian Eisel]

Commit: 22580aff76db27c233f9986db54aafc440c7596f
Author: Julian Eisel
Date:   Tue Sep 13 15:45:25 2022 +0200
Branches: asset-browser-grid-view
https://developer.blender.org/rB22580aff76db27c233f9986db54aafc440c7596f

Merge branch 'master' into asset-browser-grid-view

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



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

diff --cc release/scripts/startup/bl_ui/space_filebrowser.py
index bcaa0d88f5b,1e7faf68b3f..be40d0e8604
--- a/release/scripts/startup/bl_ui/space_filebrowser.py
+++ b/release/scripts/startup/bl_ui/space_filebrowser.py
@@@ -823,17 -838,18 +838,18 @@@ classes = 
      FILEBROWSER_MT_view,
      FILEBROWSER_MT_select,
      FILEBROWSER_MT_context_menu,
+     FILEBROWSER_MT_view_pie,
      ASSETBROWSER_PT_display,
      ASSETBROWSER_PT_filter,
 -    ASSETBROWSER_MT_editor_menus,
 -    ASSETBROWSER_MT_view,
 -    ASSETBROWSER_MT_select,
 -    ASSETBROWSER_MT_edit,
 -    ASSETBROWSER_MT_metadata_preview_menu,
 -    ASSETBROWSER_PT_metadata,
 -    ASSETBROWSER_PT_metadata_preview,
 -    ASSETBROWSER_PT_metadata_tags,
 -    ASSETBROWSER_UL_metadata_tags,
 +    ASSETBROWSEROLD_MT_editor_menus,
 +    ASSETBROWSEROLD_MT_view,
 +    ASSETBROWSEROLD_MT_select,
 +    ASSETBROWSEROLD_MT_edit,
 +    ASSETBROWSEROLD_MT_metadata_preview_menu,
 +    ASSETBROWSEROLD_PT_metadata,
 +    ASSETBROWSEROLD_PT_metadata_preview,
 +    ASSETBROWSEROLD_PT_metadata_tags,
 +    ASSETBROWSEROLD_UL_metadata_tags,
      ASSETBROWSER_MT_context_menu,
  )
  
diff --cc source/blender/makesdna/DNA_space_types.h
index f286cfcff0b,d13f3fad270..6e05dd395ba
--- a/source/blender/makesdna/DNA_space_types.h
+++ b/source/blender/makesdna/DNA_space_types.h
@@@ -1028,7 -1030,14 +1030,8 @@@ typedef enum eFileSel_Params_Flag 
    /** Enables filtering by asset catalog. */
    FILE_FILTER_ASSET_CATALOG = (1 << 15),
  } eFileSel_Params_Flag;
+ ENUM_OPERATORS(eFileSel_Params_Flag, FILE_FILTER_ASSET_CATALOG);
  
 -typedef enum eFileSel_Params_AssetCatalogVisibility {
 -  FILE_SHOW_ASSETS_ALL_CATALOGS,
 -  FILE_SHOW_ASSETS_FROM_CATALOG,
 -  FILE_SHOW_ASSETS_WITHOUT_CATALOG,
 -} eFileSel_Params_AssetCatalogVisibility;
 -
  /**
   * #FileSelectParams.rename_flag / `sfile->params->rename_flag`.
   * \note short flag. Defined as bit-flags, but currently only used as exclusive status markers.