Merge remote-tracking branch 'origin/gi' into large-worlds

# Conflicts:
#	Source/Engine/Core/Math/Vector3.h

Source/Editor/GUI/EnumComboBox.cs

@@ -261,7 +261,7 @@ namespace FlaxEditor.GUI
                     switch (formatMode)
                     {
                     case EnumDisplayAttribute.FormatMode.Default:
-                        name = CustomEditorsUtil.GetPropertyNameUI(field.Name);
+                        name = Utilities.Utils.GetPropertyNameUI(field.Name);
                         break;
                     case EnumDisplayAttribute.FormatMode.None:
                         name = field.Name;

Source/Editor/GUI/ItemsListContextMenu.cs

@@ -263,6 +263,19 @@ namespace FlaxEditor.GUI
             PerformLayout(true);
             _searchBox.Focus();
         }
+        
+        /// <summary>
+        /// Sorts the items list (by item name by default).
+        /// </summary>
+        public void SortItems()
+        {
+            ItemsPanel.SortChildren();
+            if (_categoryPanels != null)
+            {
+                for (int i = 0; i < _categoryPanels.Count; i++)
+                    _categoryPanels[i].SortChildren();
+            }
+        }
 
         /// <summary>
         /// Adds the item to the view and registers for the click event.

Source/Editor/GUI/Popups/ActorSearchPopup.cs

@@ -67,7 +67,7 @@ namespace FlaxEditor.GUI
             {
                 Find(Level.GetScene(i));
             }
-            SortChildren();
+            SortItems();
         }
 
         private void OnItemClicked(Item item)

Source/Editor/GUI/Popups/AssetSearchPopup.cs

@@ -122,7 +122,7 @@ namespace FlaxEditor.GUI
                 if (project.Content != null)
                     FindAssets(project.Content.Folder);
             }
-            SortChildren();
+            SortItems();
         }
 
         private void OnItemClicked(Item item)

Source/Editor/GUI/Popups/ScriptSearchPopup.cs

@@ -78,7 +78,7 @@ namespace FlaxEditor.GUI
             {
                 Find(Level.GetScene(i));
             }
-            SortChildren();
+            SortItems();
         }
 
         private void OnItemClicked(Item item)

Source/Editor/GUI/Popups/TypeSearchPopup.cs

@@ -95,7 +95,7 @@ namespace FlaxEditor.GUI
                     }
                 }
             }
-            SortChildren();
+            SortItems();
         }
 
         private void OnItemClicked(Item item)

Source/Editor/GUI/Timeline/Tracks/ActorTrack.cs

@@ -177,7 +177,7 @@ namespace FlaxEditor.GUI.Timeline.Tracks
                 if (SubTracks.Any(x => x is IObjectTrack y && y.Object == script))
                     continue;
 
-                var name = CustomEditorsUtil.GetPropertyNameUI(script.GetType().Name);
+                var name = Utilities.Utils.GetPropertyNameUI(script.GetType().Name);
                 menu.AddButton(name, OnAddScriptTrack).Tag = script;
             }
         }