Merge remote-tracking branch 'origin/blender-v3.0-release'

2 files changed, 5 insertions, 3 deletions

diff --git a/source/blender/editors/interface/interface_ops.c b/source/blender/editors/interface/interface_ops.c
index 9cce7dd5c85..e1fd7386408 100644
--- a/source/blender/editors/interface/interface_ops.c
+++ b/source/blender/editors/interface/interface_ops.c
@@ -1980,7 +1980,7 @@ static int ui_tree_view_drop_invoke(bContext *C, wmOperator *UNUSED(op), const w
   const ARegion *region = CTX_wm_region(C);
   uiTreeViewItemHandle *hovered_tree_item = UI_block_tree_view_find_item_at(region, event->xy);
 
-  if (!UI_tree_view_item_drop_handle(hovered_tree_item, event->customdata)) {
+  if (!UI_tree_view_item_drop_handle(C, hovered_tree_item, event->customdata)) {
     return OPERATOR_CANCELLED | OPERATOR_PASS_THROUGH;
   }
 
diff --git a/source/blender/editors/interface/tree_view.cc b/source/blender/editors/interface/tree_view.cc
index 3ed027ddd9d..b8c07b15bdc 100644
--- a/source/blender/editors/interface/tree_view.cc
+++ b/source/blender/editors/interface/tree_view.cc
@@ -787,7 +787,9 @@ char *UI_tree_view_item_drop_tooltip(const uiTreeViewItemHandle *item_, const wm
  * Let a tree-view item handle a drop event.
  * \return True if the drop was handled by the tree-view item.
  */
-bool UI_tree_view_item_drop_handle(uiTreeViewItemHandle *item_, const ListBase *drags)
+bool UI_tree_view_item_drop_handle(struct bContext *C,
+                                   uiTreeViewItemHandle *item_,
+                                   const ListBase *drags)
 {
   AbstractTreeViewItem &item = reinterpret_cast<AbstractTreeViewItem &>(*item_);
   std::unique_ptr<AbstractTreeViewItemDropController> drop_controller =
@@ -796,7 +798,7 @@ bool UI_tree_view_item_drop_handle(uiTreeViewItemHandle *item_, const ListBase *
   const char *disabled_hint_dummy = nullptr;
   LISTBASE_FOREACH (const wmDrag *, drag, drags) {
     if (drop_controller->can_drop(*drag, &disabled_hint_dummy)) {
-      return drop_controller->on_drop(*drag);
+      return drop_controller->on_drop(C, *drag);
     }
   }