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

[Julian Eisel]

Commit: 065bc42ce57f7a78d9ed0b89dd4d9b5a528a6761
Author: Julian Eisel
Date:   Wed Apr 6 11:37:28 2022 +0200
Branches: asset-browser-grid-view
https://developer.blender.org/rB065bc42ce57f7a78d9ed0b89dd4d9b5a528a6761

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

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



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

diff --cc release/scripts/startup/bl_ui/space_filebrowser.py
index 280cb5e2e4b,4144cf8c8f8..df92c15a277
--- a/release/scripts/startup/bl_ui/space_filebrowser.py
+++ b/release/scripts/startup/bl_ui/space_filebrowser.py
@@@ -742,13 -742,13 +742,13 @@@ class ASSETBROWSEROLD_PT_metadata_previ
          col.operator("ed.lib_id_load_custom_preview", icon='FILEBROWSER', text="")
          col.separator()
          col.operator("ed.lib_id_generate_preview", icon='FILE_REFRESH', text="")
 -        col.menu("ASSETBROWSER_MT_metadata_preview_menu", icon='DOWNARROW_HLT', text="")
 +        col.menu("ASSETBROWSEROLD_MT_metadata_preview_menu", icon='DOWNARROW_HLT', text="")
  
  
 -class ASSETBROWSER_MT_metadata_preview_menu(bpy.types.Menu):
 +class ASSETBROWSEROLD_MT_metadata_preview_menu(bpy.types.Menu):
      bl_label = "Preview"
  
-     def draw(self, context):
+     def draw(self, _context):
          layout = self.layout
          layout.operator("ed.lib_id_generate_preview_from_object", text="Render Active Object")
  
diff --cc source/blender/editors/interface/CMakeLists.txt
index 31777f20d0e,444bb08f3fb..a514cd6ecd1
--- a/source/blender/editors/interface/CMakeLists.txt
+++ b/source/blender/editors/interface/CMakeLists.txt
@@@ -25,8 -25,7 +25,8 @@@ set(IN
  )
  
  set(SRC
 +  grid_view.cc
-   interface.c
+   interface.cc
    interface_align.c
    interface_anim.c
    interface_button_group.c
diff --cc source/blender/editors/interface/interface_query.cc
index 8bbc62300a7,2767a184619..0ee5d59b21f
--- a/source/blender/editors/interface/interface_query.cc
+++ b/source/blender/editors/interface/interface_query.cc
@@@ -450,19 -444,9 +449,19 @@@ static bool ui_but_is_treerow(const uiB
    return but->type == UI_BTYPE_TREEROW;
  }
  
 +static bool ui_but_is_view_item_fn(const uiBut *but, const void *UNUSED(customdata))
 +{
 +  return ui_but_is_view_item(but);
 +}
 +
 +uiBut *ui_view_item_find_mouse_over(const ARegion *region, const int xy[2])
 +{
 +  return ui_but_find_mouse_over_ex(region, xy, false, ui_but_is_view_item_fn, NULL);
 +}
 +
  uiBut *ui_tree_row_find_mouse_over(const ARegion *region, const int xy[2])
  {
-   return ui_but_find_mouse_over_ex(region, xy, false, ui_but_is_treerow, NULL);
+   return ui_but_find_mouse_over_ex(region, xy, false, ui_but_is_treerow, nullptr);
  }
  
  static bool ui_but_is_active_treerow(const uiBut *but, const void *customdata)
diff --cc source/blender/editors/space_file/filelist.c
index d6d5c3493ed,08f4ecc0dd9..0bed128509b
--- a/source/blender/editors/space_file/filelist.c
+++ b/source/blender/editors/space_file/filelist.c
@@@ -357,10 -356,10 +357,10 @@@ typedef struct FileListFilter 
    char filter_search[66]; /* + 2 for heading/trailing implicit '*' wildcards. */
    short flags;
  
 -  FileAssetCatalogFilterSettingsHandle *asset_catalog_filter;
 +  AssetViewCatalogFilterSettingsHandle *asset_catalog_filter;
  } FileListFilter;
  
- /* FileListFilter.flags */
+ /** #FileListFilter.flags */
  enum {
    FLF_DO_FILTER = 1 << 0,
    FLF_HIDE_DOT = 1 << 1,