[Bf-blender-cvs] [0330d1af29c] blender-v2.90-release: Fix T77900: File Browser in macOS fullscreen crashes

Yevgeny Makarov noreply at git.blender.org
Mon Aug 31 13:29:48 CEST 2020


Commit: 0330d1af29c067cf309e4798f5259e01a8c3c668
Author: Yevgeny Makarov
Date:   Wed Aug 26 16:27:05 2020 +0200
Branches: blender-v2.90-release
https://developer.blender.org/rB0330d1af29c067cf309e4798f5259e01a8c3c668

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];
   }



More information about the Bf-blender-cvs mailing list