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

[Julian Eisel]

Commit: 6bae10ef4540360ee8583695b4da240d7ae2102c
Author: Julian Eisel
Date:   Wed Jul 20 15:42:58 2022 +0200
Branches: asset-browser-grid-view
https://developer.blender.org/rB6bae10ef4540360ee8583695b4da240d7ae2102c

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

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



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

diff --cc source/blender/editors/space_file/asset_catalog_tree_view.cc
index 3f76b8c85d5,1829f19bfd6..79e32287d26
--- a/source/blender/editors/space_file/asset_catalog_tree_view.cc
+++ b/source/blender/editors/space_file/asset_catalog_tree_view.cc
@@@ -647,10 -647,10 +647,10 @@@ bool AssetCatalogTreeViewUnassignedItem
  {
    /* Assign to nil catalog ID. */
    return AssetCatalogDropController::drop_assets_into_catalog(
-       C, tree_view<AssetCatalogTreeView>(), drag, CatalogID{});
+       C, get_view<AssetCatalogTreeView>(), drag, CatalogID{});
  }
  
 -}  // namespace blender::ed::asset_browser
 +}  // namespace blender::ed::space_file::asset_browser
  
  /* ---------------------------------------------------------------------- */