Merge branch 'master' into release

leezer3 · Oct 4, 2024 · a7e78f2 · a7e78f2
2 parents 0fdd54b + fbdbc3b
commit a7e78f2
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 2 deletions.
diff --git a/source/ObjectViewer/ProgramS.cs b/source/ObjectViewer/ProgramS.cs
@@ -470,6 +470,7 @@ internal static void KeyDown(object sender, KeyboardKeyEventArgs e)
                         Application.DoEvents();
 	                }
 	                break;
+				case Key.BackSpace:
 	            case Key.Delete:
 		            LightingRelative = -1.0;
 	                Game.Reset();

diff --git a/source/OpenBVE/System/Program.cs b/source/OpenBVE/System/Program.cs
@@ -277,8 +277,6 @@ private static void Main(string[] args) {
 				Translations.SetInGameLanguage(Translations.CurrentLanguageCode);
 			}
 
-			result.ExperimentalGLMenu = true;
-
 			if (result.ExperimentalGLMenu)
 			{
 				result.Start = true;