(cd41ee958) Merge branch 'dev' of https://github.com/Regalis11/Barotrauma-development into dev

2019-04-04 11:09:45 +03:00
parent 1966bcb4ab
commit 41da4e24a9
17 changed files with 590 additions and 71 deletions
@@ -70,6 +70,7 @@ namespace Barotrauma
        private GUIImage(RectTransform rectT, Sprite sprite, Rectangle? sourceRect, bool scaleToFit, string style) : base(style, rectT)
        {
            this.scaleToFit = scaleToFit;
+            sprite?.EnsureLazyLoaded();
            Sprite = sprite;
            if (sourceRect.HasValue)
            {