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/Windows/SceneTreeWindow.ContextMenu.cs
+++ b/Source/Editor/Windows/SceneTreeWindow.ContextMenu.cs
@@ -30,8 +30,10 @@ namespace FlaxEditor.Windows

            // Create popup

-            var contextMenu = new ContextMenu();
-            contextMenu.MinimumWidth = 120;
+            var contextMenu = new ContextMenu
+            {
+                MinimumWidth = 120
+            };

            // Expand/collapse