Merge remote-tracking branch 'origin/master' into linux-editor

# Conflicts: # Source/Engine/Core/Math/Color.cs # Source/Engine/Navigation/Navigation.cpp # Source/Engine/Platform/Win32/Win32Platform.cpp
2021-02-23 22:29:07 +01:00
parent 747a9bcb98 87a290b45c
commit cf3ac7a26e
147 changed files with 1740 additions and 1311 deletions
--- a/Source/Editor/GUI/MainMenu.cs
+++ b/Source/Editor/GUI/MainMenu.cs
@@ -250,6 +250,7 @@ namespace FlaxEditor.GUI
            {
                if (b == null && control is MainMenuButton)
                    b = (MainMenuButton)control;
+
                if (control is MainMenuButton && control.Right > b.Right)
                    b = (MainMenuButton)control;
            }