diff options
author | Sybren A. Stüvel <sybren@blender.org> | 2021-11-25 17:01:32 +0300 |
---|---|---|
committer | Sybren A. Stüvel <sybren@blender.org> | 2021-11-25 17:02:23 +0300 |
commit | c91d1961596eb3ac0905010b63551951fc1fece7 (patch) | |
tree | ad2952478500c52d2335477284ebaaf1d636526e /source/blender/editors/interface | |
parent | e253fb2143e2a8f1de331d17343d44671ab6e440 (diff) |
Fix T93274: Assigning asset catalog doesn't mark file as modified
Assigning a catalog to an asset via drag-and-drop in the asset browser
now creates an undo step. Not only does this allow undoing the action,
it also tags the blend file as modified.
Reviewed by: Severin
Differential Revision: https://developer.blender.org/D13370
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 c962a1107ae..c0a69d81c26 100644 --- a/source/blender/editors/interface/interface_ops.c +++ b/source/blender/editors/interface/interface_ops.c @@ -1977,7 +1977,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 488b3bbb726..f031c6eb8b7 100644 --- a/source/blender/editors/interface/tree_view.cc +++ b/source/blender/editors/interface/tree_view.cc @@ -762,7 +762,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 = @@ -771,7 +773,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); } } |