Merge remote-tracking branch 'origin/master' into 1.13

# Conflicts: # Source/Engine/Graphics/Materials/DeformableMaterialShader.h # Source/Engine/Platform/Windows/WindowsWindow.cpp # Source/Engine/Platform/Windows/WindowsWindow.h
2026-08-08 06:40:11 +02:00
parent 1e5d8e3329 b8d403f32d
commit 59227bbc8b
26 changed files with 241 additions and 52 deletions
@@ -287,6 +287,7 @@ namespace FlaxEditor.Modules
                case Options.InterfaceOptions.PlayModeFocus.None: break;

                case Options.InterfaceOptions.PlayModeFocus.GameWindow:
+                case Options.InterfaceOptions.PlayModeFocus.GameWindowThenRestoreEditor:
                    gameWin.FocusGameViewport();
                    break;

@@ -320,6 +321,11 @@ namespace FlaxEditor.Modules
                        _previousWindow.Focus();
                    }
                    break;
+                case Options.InterfaceOptions.PlayModeFocus.GameWindowThenRestoreEditor:
+                    var editorWin = Editor.Windows.EditWin;
+                    if (editorWin != null && !editorWin.IsDisposing)
+                        editorWin.Focus();
+                    break;
                }
            }