[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [57181] trunk/blender/source/blender/ windowmanager/intern/wm_window.c: Bug fix, own collection while testing

Ton Roosendaal ton at blender.org
Sat Jun 1 17:24:17 CEST 2013


Revision: 57181
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=57181
Author:   ton
Date:     2013-06-01 15:24:15 +0000 (Sat, 01 Jun 2013)
Log Message:
-----------
Bug fix, own collection while testing

New OSX "Life resize" was also being called during opening of windows - when things are
not initialized yet. Crashed on opening full-screen window (which is animated in OSX).

Modified Paths:
--------------
    trunk/blender/source/blender/windowmanager/intern/wm_window.c

Modified: trunk/blender/source/blender/windowmanager/intern/wm_window.c
===================================================================
--- trunk/blender/source/blender/windowmanager/intern/wm_window.c	2013-06-01 12:45:45 UTC (rev 57180)
+++ trunk/blender/source/blender/windowmanager/intern/wm_window.c	2013-06-01 15:24:15 UTC (rev 57181)
@@ -711,6 +711,11 @@
 		GHOST_TEventDataPtr data = GHOST_GetEventData(evt);
 		wmWindow *win;
 		
+		/* Ghost now can call this function for life resizes, but it should return if WM didn't initialize yet.
+		   Can happen on file read (especially full size window)  */
+		if ((wm->initialized & WM_INIT_WINDOW) == 0) {
+			return 1;
+		}
 		if (!ghostwin) {
 			/* XXX - should be checked, why are we getting an event here, and */
 			/* what is it? */




More information about the Bf-blender-cvs mailing list