From c8d6e2dfa0e02ac214897f85a8e58f34bddddfd5 Mon Sep 17 00:00:00 2001 From: Julian Eisel Date: Sun, 24 Jan 2021 21:20:56 +0100 Subject: UI: Avoid showing drop hint on drag & drop if dropping won't succeed If the poll check of the operator fails, the operator won't run. We can check that in advance to hide the drop hint if dropping will fail anyway. This improves feedback during dragging. --- source/blender/windowmanager/intern/wm_dragdrop.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'source/blender') diff --git a/source/blender/windowmanager/intern/wm_dragdrop.c b/source/blender/windowmanager/intern/wm_dragdrop.c index 289a18a771a..6fdcbab889c 100644 --- a/source/blender/windowmanager/intern/wm_dragdrop.c +++ b/source/blender/windowmanager/intern/wm_dragdrop.c @@ -225,7 +225,8 @@ static const char *dropbox_active(bContext *C, if (handler->dropboxes) { LISTBASE_FOREACH (wmDropBox *, drop, handler->dropboxes) { const char *tooltip = NULL; - if (drop->poll(C, drag, event, &tooltip)) { + if (drop->poll(C, drag, event, &tooltip) && + WM_operator_poll_context(C, drop->ot, drop->opcontext)) { /* XXX Doing translation here might not be ideal, but later we have no more * access to ot (and hence op context)... */ return (tooltip) ? tooltip : WM_operatortype_name(drop->ot, drop->ptr); -- cgit v1.2.3