Merge remote-tracking branch 'origin' into blender2.8
authorGaia Clary <gaia.clary@machinimatrix.org>
Sun, 11 Mar 2018 22:45:53 +0000 (23:45 +0100)
committerGaia Clary <gaia.clary@machinimatrix.org>
Sun, 11 Mar 2018 22:45:53 +0000 (23:45 +0100)
1  2 
source/blender/collada/AnimationExporter.cpp
source/blender/collada/AnimationImporter.cpp
source/blender/collada/ArmatureImporter.cpp
source/blender/collada/DocumentImporter.cpp
source/blender/collada/ImageExporter.cpp
source/blender/collada/MeshImporter.cpp
source/blender/windowmanager/intern/wm_window.c
source/creator/creator_args.c

index ecd91ff2d1a9baefd4bb742b30e1f6761ab0e6d4,ceb51171021a37307502fb7f5271a7b1f1d252b7..8d5282b907643f22d5c29e205deb3bca7ca1869d
@@@ -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;
Simple merge