[Bf-blender-cvs] [6568b6d] master: Fix T45456: Error's in splash don't restore cursor

Campbell Barton noreply at git.blender.org
Thu Jul 16 09:33:15 CEST 2015


Commit: 6568b6d1cdcaf32487bbcd48b4d20da32954c6f5
Author: Campbell Barton
Date:   Thu Jul 16 17:28:20 2015 +1000
Branches: master
https://developer.blender.org/rB6568b6d1cdcaf32487bbcd48b4d20da32954c6f5

Fix T45456: Error's in splash don't restore cursor

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

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

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

diff --git a/source/blender/windowmanager/intern/wm_window.c b/source/blender/windowmanager/intern/wm_window.c
index cc0f333..c538724 100644
--- a/source/blender/windowmanager/intern/wm_window.c
+++ b/source/blender/windowmanager/intern/wm_window.c
@@ -516,6 +516,11 @@ void wm_window_add_ghostwindows(wmWindowManager *wm)
 				wm_init_state.override_flag &= ~WIN_OVERRIDE_WINSTATE;
 			}
 
+			/* without this, cursor restore may fail, T45456 */
+			if (win->cursor == 0) {
+				win->cursor = CURSOR_STD;
+			}
+
 			wm_window_add_ghostwindow(wm, "Blender", win);
 		}
 		/* happens after fileread */




More information about the Bf-blender-cvs mailing list