[Bf-blender-cvs] [6955add502b] blender2.8: Fix T55166: crash joining areas

Campbell Barton noreply at git.blender.org
Wed May 23 20:25:58 CEST 2018


Commit: 6955add502b273b24fa9ea44298cc7c396160e0f
Author: Campbell Barton
Date:   Wed May 23 20:23:13 2018 +0200
Branches: blender2.8
https://developer.blender.org/rB6955add502b273b24fa9ea44298cc7c396160e0f

Fix T55166: crash joining areas

Caused by own commit 6e40b2de7ae8,

Tested w/o this call and can't find any errors so commenting the call.

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

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 c2fbd0aa558..4f3f8ece1f0 100644
--- a/source/blender/windowmanager/intern/wm_event_system.c
+++ b/source/blender/windowmanager/intern/wm_event_system.c
@@ -1961,7 +1961,11 @@ 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);
+					/* Causes crash when joining areas: T55166, seems this is not even needed. */
+#if 0
 					ED_region_cursor_set(win, area, region);
+#endif
+
 
 					BLI_remlink(handlers, handler);
 					wm_event_free_handler(handler);



More information about the Bf-blender-cvs mailing list