From e6265105b522fc5f2042626d7d0697bcc60458b8 Mon Sep 17 00:00:00 2001 From: Chandler Cox Date: Sat, 19 Jul 2025 15:39:11 -0500 Subject: [PATCH] Move to interface options. --- Source/Editor/Options/GeneralOptions.cs | 6 ------ Source/Editor/Options/InterfaceOptions.cs | 6 ++++++ Source/Editor/Windows/GameCookerWindow.cs | 4 ++-- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/Source/Editor/Options/GeneralOptions.cs b/Source/Editor/Options/GeneralOptions.cs index 23dc17733..59fac7a63 100644 --- a/Source/Editor/Options/GeneralOptions.cs +++ b/Source/Editor/Options/GeneralOptions.cs @@ -127,12 +127,6 @@ namespace FlaxEditor.Options BuildAction.NavMesh, }; - /// - /// Gets or sets the build configuration to use when using Cook and Run option in the editor. - /// - [EditorDisplay("General"), EditorOrder(201), ExpandGroups, Tooltip("The build configuration to use when using Cook and Run option in the editor.")] - public BuildConfiguration CookAndRunBuildConfiguration { get; set; } = BuildConfiguration.Development; - /// /// Gets or sets a value indicating whether perform automatic scripts reload on main window focus. /// diff --git a/Source/Editor/Options/InterfaceOptions.cs b/Source/Editor/Options/InterfaceOptions.cs index 617c1c3de..e86f5cf42 100644 --- a/Source/Editor/Options/InterfaceOptions.cs +++ b/Source/Editor/Options/InterfaceOptions.cs @@ -420,6 +420,12 @@ namespace FlaxEditor.Options [DefaultValue(1), Range(1, 4)] [EditorDisplay("Cook & Run"), EditorOrder(600)] public int NumberOfGameClientsToLaunch = 1; + + /// + /// Gets or sets the build configuration to use when using Cook and Run option in the editor. + /// + [EditorDisplay("Cook & Run"), EditorOrder(601), ExpandGroups, Tooltip("The build configuration to use when using Cook and Run option in the editor.")] + public BuildConfiguration CookAndRunBuildConfiguration { get; set; } = BuildConfiguration.Development; /// /// Gets or sets the curvature of the line connecting to connected visject nodes. diff --git a/Source/Editor/Windows/GameCookerWindow.cs b/Source/Editor/Windows/GameCookerWindow.cs index eb65fd62b..01c482c19 100644 --- a/Source/Editor/Windows/GameCookerWindow.cs +++ b/Source/Editor/Windows/GameCookerWindow.cs @@ -976,7 +976,7 @@ namespace FlaxEditor.Windows Editor.Log("Building and running"); GameCooker.GetCurrentPlatform(out var platform, out var buildPlatform, out _); var numberOfClients = Editor.Options.Options.Interface.NumberOfGameClientsToLaunch; - var buildConfig = Editor.Options.Options.General.CookAndRunBuildConfiguration; + var buildConfig = Editor.Options.Options.Interface.CookAndRunBuildConfiguration; for (int i = 0; i < numberOfClients; i++) { var buildOptions = BuildOptions.AutoRun; @@ -1004,7 +1004,7 @@ namespace FlaxEditor.Windows Editor.Log("Running cooked build"); GameCooker.GetCurrentPlatform(out var platform, out var buildPlatform, out _); var numberOfClients = Editor.Options.Options.Interface.NumberOfGameClientsToLaunch; - var buildConfig = Editor.Options.Options.General.CookAndRunBuildConfiguration; + var buildConfig = Editor.Options.Options.Interface.CookAndRunBuildConfiguration; for (int i = 0; i < numberOfClients; i++) { _buildingQueue.Enqueue(new QueueItem