[Bf-blender-cvs] [0e492ac] master: Fix T36652: .blend file with minimized window not loading correctly on Windows.
Brecht Van Lommel
noreply at git.blender.org
Wed Feb 26 20:52:17 CET 2014
Commit: 0e492ac482a829734d0b3b257a373e141e375ecc
Author: Brecht Van Lommel
Date: Wed Feb 26 20:50:55 2014 +0100
https://developer.blender.org/rB0e492ac482a829734d0b3b257a373e141e375ecc
Fix T36652: .blend file with minimized window not loading correctly on Windows.
===================================================================
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 6432421..d5ad1c7 100644
--- a/source/blender/windowmanager/intern/wm_window.c
+++ b/source/blender/windowmanager/intern/wm_window.c
@@ -373,6 +373,12 @@ static void wm_window_add_ghostwindow(const char *title, wmWindow *win)
if (win->eventstate == NULL)
win->eventstate = MEM_callocN(sizeof(wmEvent), "window event state");
+ /* store actual window size in blender window */
+ bounds = GHOST_GetClientBounds(win->ghostwin);
+ win->sizex = GHOST_GetWidthRectangle(bounds);
+ win->sizey = GHOST_GetHeightRectangle(bounds);
+ GHOST_DisposeRectangle(bounds);
+
/* set the state */
GHOST_SetWindowState(ghostwin, (GHOST_TWindowState)win->windowstate);
@@ -388,13 +394,6 @@ static void wm_window_add_ghostwindow(const char *title, wmWindow *win)
U.pixelsize = GHOST_GetNativePixelSize(win->ghostwin);
BKE_userdef_state();
- /* store actual window size in blender window */
- bounds = GHOST_GetClientBounds(win->ghostwin);
- win->sizex = GHOST_GetWidthRectangle(bounds);
- win->sizey = GHOST_GetHeightRectangle(bounds);
- GHOST_DisposeRectangle(bounds);
-
-
wm_window_swap_buffers(win);
//GHOST_SetWindowState(ghostwin, GHOST_kWindowStateModified);
More information about the Bf-blender-cvs
mailing list