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/include | |
parent | 9812a08848b8a5264948ae1e2a4b0343d2e7f9e2 (diff) | |
parent | c91d1961596eb3ac0905010b63551951fc1fece7 (diff) |
Merge remote-tracking branch 'origin/blender-v3.0-release'
Diffstat (limited to 'source/blender/editors/include')
-rw-r--r-- | source/blender/editors/include/UI_interface.h | 4 | ||||
-rw-r--r-- | source/blender/editors/include/UI_tree_view.hh | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/source/blender/editors/include/UI_interface.h b/source/blender/editors/include/UI_interface.h index d5d45068828..29d031ba13d 100644 --- a/source/blender/editors/include/UI_interface.h +++ b/source/blender/editors/include/UI_interface.h @@ -2782,7 +2782,9 @@ bool UI_tree_view_item_can_drop(const uiTreeViewItemHandle *item_, const struct wmDrag *drag, const char **r_disabled_hint); char *UI_tree_view_item_drop_tooltip(const uiTreeViewItemHandle *item, const struct wmDrag *drag); -bool UI_tree_view_item_drop_handle(uiTreeViewItemHandle *item_, const struct ListBase *drags); +bool UI_tree_view_item_drop_handle(struct bContext *C, + uiTreeViewItemHandle *item_, + const struct ListBase *drags); bool UI_tree_view_item_can_rename(const uiTreeViewItemHandle *item_handle); void UI_tree_view_item_begin_rename(uiTreeViewItemHandle *item_handle); diff --git a/source/blender/editors/include/UI_tree_view.hh b/source/blender/editors/include/UI_tree_view.hh index 7682570a5c6..0a054101e81 100644 --- a/source/blender/editors/include/UI_tree_view.hh +++ b/source/blender/editors/include/UI_tree_view.hh @@ -407,7 +407,7 @@ class AbstractTreeViewItemDropController { * Execute the logic to apply a drop of the data dragged with \a drag onto/into the item this * controller is for. */ - virtual bool on_drop(const wmDrag &drag) = 0; + virtual bool on_drop(struct bContext *C, const wmDrag &drag) = 0; template<class TreeViewType> inline TreeViewType &tree_view() const; }; |