diff options
| author | Gaia Clary <gaia.clary@machinimatrix.org> | 2018-03-12 01:45:53 +0300 |
|---|---|---|
| committer | Gaia Clary <gaia.clary@machinimatrix.org> | 2018-03-12 01:45:53 +0300 |
| commit | ddae05cdca9211a789a6501c6ca054f9a46e07c5 (patch) | |
| tree | e7591dd7c31ccfb6c25beb0bca7bf670a788cd35 /source/blender/windowmanager | |
| parent | 7ecc7c46af493f984e9cb2f08ac75da5b30ffd35 (diff) | |
| parent | 2c9c22df26dfdcf03bb308fdf35294ed79c2d0e5 (diff) | |
Merge remote-tracking branch 'origin' into blender2.8
Diffstat (limited to 'source/blender/windowmanager')
| -rw-r--r-- | source/blender/windowmanager/intern/wm_window.c | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/source/blender/windowmanager/intern/wm_window.c b/source/blender/windowmanager/intern/wm_window.c index ecd91ff2d1a..8d5282b9076 100644 --- a/source/blender/windowmanager/intern/wm_window.c +++ b/source/blender/windowmanager/intern/wm_window.c @@ -495,12 +495,7 @@ static void wm_window_ghostwindow_add(wmWindowManager *wm, const char *title, wm 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); |