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

2025-06-16 14:09:29 +03:00
parent 88d2b72822 3c74b315a8
commit 6ff260d052
65 changed files with 3633 additions and 880 deletions
--- a/Source/Engine/UI/GUI/Common/TextBox.cs
+++ b/Source/Engine/UI/GUI/Common/TextBox.cs
@@ -301,7 +301,7 @@ namespace FlaxEngine.GUI
            else
            {
                text = _watermarkText;
-                if (text.Length > 0)
+                if (text?.Length > 0)
                {
                    Render2D.DrawText(font, _watermarkText, WatermarkTextColor, ref _layout, TextMaterial);
                }