[Bf-blender-cvs] [ddae05cdca9] blender2.8: Merge remote-tracking branch 'origin' into blender2.8
Gaia Clary
noreply at git.blender.org
Sun Mar 11 23:47:36 CET 2018
Commit: ddae05cdca9211a789a6501c6ca054f9a46e07c5
Author: Gaia Clary
Date: Sun Mar 11 23:45:53 2018 +0100
Branches: blender2.8
https://developer.blender.org/rBddae05cdca9211a789a6501c6ca054f9a46e07c5
Merge remote-tracking branch 'origin' into blender2.8
===================================================================
===================================================================
diff --cc source/blender/windowmanager/intern/wm_window.c
index ecd91ff2d1a,ceb51171021..8d5282b9076
--- a/source/blender/windowmanager/intern/wm_window.c
+++ b/source/blender/windowmanager/intern/wm_window.c
@@@ -495,19 -448,12 +495,14 @@@ static void wm_window_ghostwindow_add(w
ghostwin = GHOST_CreateWindow(g_system, title,
win->posx, posy, win->sizex, win->sizey,
- #ifdef __APPLE__
- /* we agreed to not set any fullscreen or iconized state on startup */
- GHOST_kWindowStateNormal,
- #else
(GHOST_TWindowState)win->windowstate,
- #endif
GHOST_kDrawingContextTypeOpenGL,
glSettings);
-
+
if (ghostwin) {
GHOST_RectangleHandle bounds;
+
+ win->gwnctx = GWN_context_create();
/* the new window has already been made drawable upon creation */
wm->windrawable = win;
More information about the Bf-blender-cvs
mailing list