diff options
| author | Julian Eisel <julian@blender.org> | 2021-11-18 13:53:46 +0300 |
|---|---|---|
| committer | Julian Eisel <julian@blender.org> | 2021-11-18 13:53:46 +0300 |
| commit | 2b63a76041c0ba6c1fe19d0b343d3e70af4d4f59 (patch) | |
| tree | 62039e9ffc6bf5c1b7f0ef6a9079b4c2aefbe364 /source/blender/windowmanager/intern | |
| parent | e1a3b697ec03d20207ee0c1fef6f816cb7856961 (diff) | |
| parent | e5774282b94772af8822f4e3ab8b24207a450fb8 (diff) | |
Merge branch 'blender-v3.0-release'
Diffstat (limited to 'source/blender/windowmanager/intern')
| -rw-r--r-- | source/blender/windowmanager/intern/wm_dragdrop.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/source/blender/windowmanager/intern/wm_dragdrop.c b/source/blender/windowmanager/intern/wm_dragdrop.c index e3300a0f087..bc87347b2f3 100644 --- a/source/blender/windowmanager/intern/wm_dragdrop.c +++ b/source/blender/windowmanager/intern/wm_dragdrop.c @@ -778,6 +778,12 @@ static void wm_drag_draw_icon(bContext *UNUSED(C), const int xy[2]) { int x, y; + + /* This could also get the preview image of an ID when dragging one. But the big preview icon may + * actually not always be wanted, for example when dragging objects in the Outliner it gets in + * the way). So make the drag user set an image buffer explicitly (e.g. through + * #UI_but_drag_attach_image()). */ + if (drag->imb) { x = xy[0] - drag->sx / 2; y = xy[1] - drag->sy / 2; |