Merge remote-tracking branch 'origin/master' into 1.6

2023-05-05 11:41:32 +02:00
parent 238526bdc4 de1ba2de6f
commit 22239bc2d1
15 changed files with 96 additions and 16 deletions
--- a/Source/Editor/CustomEditors/Elements/ComboBoxElement.cs
+++ b/Source/Editor/CustomEditors/Elements/ComboBoxElement.cs
@@ -6,7 +6,7 @@ using FlaxEngine.GUI;
 namespace FlaxEditor.CustomEditors.Elements
 {
    /// <summary>
-    /// The combobx element.
+    /// The combobox element.
    /// </summary>
    /// <seealso cref="FlaxEditor.CustomEditors.LayoutElement" />
    public class ComboBoxElement : LayoutElement