diff options
| author | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2018-08-10 18:04:05 +0300 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2018-08-10 18:54:00 +0300 |
| commit | d7b5e2fa72c91b603713b52eec22af9ae131926d (patch) | |
| tree | 04a9e350c23cc68888f7a56e55bbd85ca9ecdfbe /source/blender/windowmanager/intern/wm_dragdrop.c | |
| parent | 4375e7ff0b74f96447e27f78a0d9245353d36865 (diff) | |
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.
Diffstat (limited to 'source/blender/windowmanager/intern/wm_dragdrop.c')
| -rw-r--r-- | source/blender/windowmanager/intern/wm_dragdrop.c | 3 |
1 files changed, 2 insertions, 1 deletions
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: |