Merge branch 'master' of https://github.com/HydrogenC/FlaxEngine into HydrogenC-master

2024-02-18 16:11:31 +01:00
parent 4df8a12666 4497b2ca7d
commit 45aa0e1b65
29 changed files with 1762 additions and 150 deletions
--- a/Source/Editor/Windows/Assets/FontWindow.cs
+++ b/Source/Editor/Windows/Assets/FontWindow.cs
@@ -144,7 +144,7 @@ namespace FlaxEditor.Windows.Assets
        protected override void OnAssetLinked()
        {
            Asset.WaitForLoaded();
-            _textPreview.Font = new FontReference(Asset.CreateFont(30));
+            _textPreview.Font = new FontReference(Asset, 30);
            _inputText.Text = string.Format("This is a sample text using font {0}.", Asset.FamilyName);
            var options = Asset.Options;
            _proxy.Set(ref options);