Merge branch 'master' into feature-imformatfeature-imformat

1 files changed, 6 insertions, 4 deletions

diff --git a/source/blender/editors/interface/interface_drag.cc b/source/blender/editors/interface/interface_drag.cc
index 4c68870b2c7..4bf2dac4151 100644
--- a/source/blender/editors/interface/interface_drag.cc
+++ b/source/blender/editors/interface/interface_drag.cc
@@ -37,7 +37,7 @@ void UI_but_drag_set_asset(uiBut *but,
 {
   wmDragAsset *asset_drag = WM_drag_create_asset_data(asset, metadata, path, import_type);
 
-  /* FIXME: This is temporary evil solution to get scene/viewlayer/etc in the copy callback of the
+  /* FIXME: This is temporary evil solution to get scene/view-layer/etc in the copy callback of the
    * #wmDropBox.
    * TODO: Handle link/append in operator called at the end of the drop process, and NOT in its
    * copy callback.
@@ -122,7 +122,7 @@ bool ui_but_drag_is_draggable(const uiBut *but)
 
 void ui_but_drag_start(bContext *C, uiBut *but)
 {
-  wmDrag *drag = WM_event_start_drag(C,
+  wmDrag *drag = WM_drag_data_create(C,
                                      but->icon,
                                      but->dragtype,
                                      but->dragpoin,
@@ -130,15 +130,17 @@ void ui_but_drag_start(bContext *C, uiBut *but)
                                      (but->dragflag & UI_BUT_DRAGPOIN_FREE) ? WM_DRAG_FREE_DATA :
                                                                               WM_DRAG_NOP);
   /* wmDrag has ownership over dragpoin now, stop messing with it. */
-  but->dragpoin = NULL;
+  but->dragpoin = nullptr;
 
   if (but->imb) {
     WM_event_drag_image(drag, but->imb, but->imb_scale);
   }
 
+  WM_event_start_prepared_drag(C, drag);
+
   /* Special feature for assets: We add another drag item that supports multiple assets. It
    * gets the assets from context. */
   if (ELEM(but->dragtype, WM_DRAG_ASSET, WM_DRAG_ID)) {
-    WM_event_start_drag(C, ICON_NONE, WM_DRAG_ASSET_LIST, NULL, 0, WM_DRAG_NOP);
+    WM_event_start_drag(C, ICON_NONE, WM_DRAG_ASSET_LIST, nullptr, 0, WM_DRAG_NOP);
   }
 }