diff options
author | Sybren A. Stüvel <sybren@blender.org> | 2021-11-25 17:22:40 +0300 |
---|---|---|
committer | Sybren A. Stüvel <sybren@blender.org> | 2021-11-25 17:22:40 +0300 |
commit | 3652f5f758aafa2103519c3c0663ba8643b554c1 (patch) | |
tree | cde6022d74747015518ffc8ae4c650176617fbf7 /source/blender/editors/interface | |
parent | 9812a08848b8a5264948ae1e2a4b0343d2e7f9e2 (diff) | |
parent | c91d1961596eb3ac0905010b63551951fc1fece7 (diff) |
Merge remote-tracking branch 'origin/blender-v3.0-release'
Diffstat (limited to 'source/blender/editors/interface')
-rw-r--r-- | source/blender/editors/interface/interface_ops.c | 2 | ||||
-rw-r--r-- | source/blender/editors/interface/tree_view.cc | 6 |
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); } } |