From eb57377f12123587a894582458c46aa09ef7c61d Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Wed, 20 May 2020 22:04:59 +1000 Subject: Fix T76794: Number button cursor overrides eyedropper cursor Pressing 'E' over a number button to pick a distance was keeping left-right arrows instead of using the eye-dropper cursor. Workaround this by clearing the active button before setting the cursor. --- source/blender/editors/interface/interface_eyedropper_datablock.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'source/blender/editors/interface/interface_eyedropper_datablock.c') diff --git a/source/blender/editors/interface/interface_eyedropper_datablock.c b/source/blender/editors/interface/interface_eyedropper_datablock.c index d9c77c26941..f2217db9b7d 100644 --- a/source/blender/editors/interface/interface_eyedropper_datablock.c +++ b/source/blender/editors/interface/interface_eyedropper_datablock.c @@ -316,7 +316,10 @@ static int datadropper_invoke(bContext *C, wmOperator *op, const wmEvent *UNUSED { /* init */ if (datadropper_init(C, op)) { - WM_cursor_modal_set(CTX_wm_window(C), WM_CURSOR_EYEDROPPER); + wmWindow *win = CTX_wm_window(C); + /* Workaround for de-activating the button clearing the cursor, see T76794 */ + UI_context_active_but_clear(C, win, CTX_wm_region(C)); + WM_cursor_modal_set(win, WM_CURSOR_EYEDROPPER); /* add temp handler */ WM_event_add_modal_handler(C, op); -- cgit v1.2.3