1 files changed, 34 insertions, 5 deletions

diff --git a/source/blender/editors/interface/interface_dropboxes.cc b/source/blender/editors/interface/interface_dropboxes.cc
index 62250a34cf4..81a1354cbe7 100644
--- a/source/blender/editors/interface/interface_dropboxes.cc
+++ b/source/blender/editors/interface/interface_dropboxes.cc
@@ -22,6 +22,10 @@
 
 #include "DNA_space_types.h"
 
+#include "MEM_guardedalloc.h"
+
+#include "RNA_access.h"
+
 #include "WM_api.h"
 
 #include "UI_interface.h"
@@ -35,24 +39,43 @@ static bool ui_tree_view_drop_poll(bContext *C, wmDrag *drag, const wmEvent *eve
     return false;
   }
 
-  return UI_tree_view_item_can_drop(hovered_tree_item, drag);
+  if (drag->free_disabled_info) {
+    MEM_SAFE_FREE(drag->disabled_info);
+  }
+
+  drag->free_disabled_info = false;
+  return UI_tree_view_item_can_drop(hovered_tree_item, drag, &drag->disabled_info);
 }
 
 static char *ui_tree_view_drop_tooltip(bContext *C,
                                        wmDrag *drag,
-                                       const wmEvent *event,
+                                       const int xy[2],
                                        wmDropBox *UNUSED(drop))
 {
   const ARegion *region = CTX_wm_region(C);
-  const uiTreeViewItemHandle *hovered_tree_item = UI_block_tree_view_find_item_at(region,
-                                                                                  event->xy);
+  const uiTreeViewItemHandle *hovered_tree_item = UI_block_tree_view_find_item_at(region, xy);
   if (!hovered_tree_item) {
     return nullptr;
   }
 
-  return UI_tree_view_item_drop_tooltip(hovered_tree_item, C, drag, event);
+  return UI_tree_view_item_drop_tooltip(hovered_tree_item, drag);
 }
 
+/* ---------------------------------------------------------------------- */
+
+static bool ui_drop_name_poll(struct bContext *C, wmDrag *drag, const wmEvent *UNUSED(event))
+{
+  return UI_but_active_drop_name(C) && (drag->type == WM_DRAG_ID);
+}
+
+static void ui_drop_name_copy(wmDrag *drag, wmDropBox *drop)
+{
+  const ID *id = WM_drag_get_local_ID(drag, 0);
+  RNA_string_set(drop->ptr, "string", id->name + 2);
+}
+
+/* ---------------------------------------------------------------------- */
+
 void ED_dropboxes_ui()
 {
   ListBase *lb = WM_dropboxmap_find("User Interface", SPACE_EMPTY, 0);
@@ -63,4 +86,10 @@ void ED_dropboxes_ui()
                  nullptr,
                  nullptr,
                  ui_tree_view_drop_tooltip);
+  WM_dropbox_add(lb,
+                 "UI_OT_drop_name",
+                 ui_drop_name_poll,
+                 ui_drop_name_copy,
+                 WM_drag_free_imported_drag_ID,
+                 nullptr);
 }