Commit: 2ef5fabec9ac8f03c3da3fb201164a4fa4a9220d Author: Yevgeny Makarov Date: Wed Aug 26 16:27:05 2020 +0200 Branches: master https://developer.blender.org/rB2ef5fabec9ac8f03c3da3fb201164a4fa4a9220d
Fix T77900: File Browser in macOS fullscreen crashes When Blender is started in fullscreen mode from the command line, or if the fullscreen state is saved in the startup file, all temporary windows will also open in fullscreen mode. When closing the fullscreen File Browser, Blender would either crash or parent window becomes black. This does not happen if the Blender switches to full screen manually. `NSWindowCollectionBehaviorFullScreenPrimary` should be set for windows that can enter full-screen mode. Otherwise macOS will turn the wrong window into full-screen. Similar fix: rB4b39de677d20 Differential Revision: https://developer.blender.org/D8708 Reviewed by: Julian Eisel =================================================================== M intern/ghost/intern/GHOST_WindowCocoa.mm =================================================================== diff --git a/intern/ghost/intern/GHOST_WindowCocoa.mm b/intern/ghost/intern/GHOST_WindowCocoa.mm index 62b0e48a7c1..f8e2f96d111 100644 --- a/intern/ghost/intern/GHOST_WindowCocoa.mm +++ b/intern/ghost/intern/GHOST_WindowCocoa.mm @@ -415,7 +415,7 @@ GHOST_WindowCocoa::GHOST_WindowCocoa(GHOST_SystemCocoa *systemCocoa, [parentWindow->getCocoaWindow() addChildWindow:m_window ordered:NSWindowAbove]; [m_window setCollectionBehavior:NSWindowCollectionBehaviorFullScreenAuxiliary]; } - else if (state != GHOST_kWindowStateFullScreen) { + else { [m_window setCollectionBehavior:NSWindowCollectionBehaviorFullScreenPrimary]; } _______________________________________________ Bf-blender-cvs mailing list [email protected] https://lists.blender.org/mailman/listinfo/bf-blender-cvs
