From d7b5e2fa72c91b603713b52eec22af9ae131926d Mon Sep 17 00:00:00 2001 From: Brecht Van Lommel Date: Fri, 10 Aug 2018 17:04:05 +0200 Subject: Outliner: use generic WM drag and drop system for collections. * Drag and drop between multiple outliners now works. * Dragging the icon and text now give the same results. * Fixes various crashes. --- source/blender/windowmanager/intern/wm_dragdrop.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'source/blender/windowmanager/intern/wm_dragdrop.c') diff --git a/source/blender/windowmanager/intern/wm_dragdrop.c b/source/blender/windowmanager/intern/wm_dragdrop.c index 0c77ad89292..73748ba6322 100644 --- a/source/blender/windowmanager/intern/wm_dragdrop.c +++ b/source/blender/windowmanager/intern/wm_dragdrop.c @@ -352,9 +352,10 @@ static const char *wm_drag_name(wmDrag *drag) if (single) { return id->name + 2; } - else { + else if (id) { return BKE_idcode_to_name_plural(GS(id->name)); } + break; } case WM_DRAG_PATH: case WM_DRAG_NAME: -- cgit v1.2.3