Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrecht Van Lommel <brechtvanlommel@gmail.com>2014-02-26 23:50:55 +0400
committerBrecht Van Lommel <brechtvanlommel@gmail.com>2014-02-26 23:50:55 +0400
commit0e492ac482a829734d0b3b257a373e141e375ecc (patch)
treec283125e2191b68c0d97d68c3f3660332c7ff10a /source/blender/windowmanager
parent0de1df49e1f4465d4095e1d5b22b71836cdd6226 (diff)
Fix T36652: .blend file with minimized window not loading correctly on Windows.
Diffstat (limited to 'source/blender/windowmanager')
-rw-r--r--source/blender/windowmanager/intern/wm_window.c13
1 files changed, 6 insertions, 7 deletions
diff --git a/source/blender/windowmanager/intern/wm_window.c b/source/blender/windowmanager/intern/wm_window.c
index 643242102a3..d5ad1c7e139 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);