Merge branch '1.2' into IconOverhaul

2021-05-13 15:21:36 +02:00
parent d54efc73f1 2c51f79c0a
commit 887b52c18a
577 changed files with 26583 additions and 26529 deletions
--- a/Source/Editor/Windows/Assets/ModelWindow.cs
+++ b/Source/Editor/Windows/Assets/ModelWindow.cs
@@ -565,7 +565,6 @@ namespace FlaxEditor.Windows.Assets
                public UVsLayoutPreviewControl()
                {
                    Offsets = new Margin(4);
-                    AnchorPreset = AnchorPresets.HorizontalStretchMiddle;
                    AutomaticInvalidate = false;
                }

@@ -619,9 +618,9 @@ namespace FlaxEditor.Windows.Assets
                }

                /// <inheritdoc />
-                protected override void DrawChildren()
+                public override void DrawSelf()
                {
-                    base.DrawChildren();
+                    base.DrawSelf();

                    var size = Size;
                    if (_channel == UVChannel.None || size.MaxValue < 5.0f)