[Bf-blender-cvs] [6e40b2de7ae] blender2.8: Fix operator execution resetting the cursor

Campbell Barton noreply at git.blender.org
Fri May 18 12:01:52 CEST 2018


Commit: 6e40b2de7ae81653f4005fbcd159aae2687f6e8d
Author: Campbell Barton
Date:   Fri May 18 11:42:58 2018 +0200
Branches: blender2.8
https://developer.blender.org/rB6e40b2de7ae81653f4005fbcd159aae2687f6e8d

Fix operator execution resetting the cursor

Area and region are NULL in the context if the operator finishes.

===================================================================

M	source/blender/windowmanager/intern/wm_event_system.c

===================================================================

diff --git a/source/blender/windowmanager/intern/wm_event_system.c b/source/blender/windowmanager/intern/wm_event_system.c
index ad10475906d..74de77ee1c2 100644
--- a/source/blender/windowmanager/intern/wm_event_system.c
+++ b/source/blender/windowmanager/intern/wm_event_system.c
@@ -1958,7 +1958,7 @@ static int wm_handler_operator_call(bContext *C, ListBase *handlers, wmEventHand
 					/* set cursor back to the default for the region */
 					wmWindow *win = CTX_wm_window(C);
 					WM_cursor_grab_disable(win, NULL);
-					ED_region_cursor_set(win, CTX_wm_area(C), CTX_wm_region(C));
+					ED_region_cursor_set(win, area, region);
 
 					BLI_remlink(handlers, handler);
 					wm_event_free_handler(handler);



More information about the Bf-blender-cvs mailing list