(b451554e8) Merge remote-tracking branch 'origin/dev' into keymapping-refactor-test

2019-04-04 11:10:29 +03:00
parent b08a31a68f
commit cc122f2bbf
52 changed files with 601 additions and 786 deletions
@@ -55,7 +55,13 @@ namespace Barotrauma
            get { return textureOffset; }
            set { textureOffset = value; }
        }
-        
+
+        partial void InitProjSpecific()
+        {
+            Prefab.sprite?.EnsureLazyLoaded();
+            Prefab.BackgroundSprite?.EnsureLazyLoaded();
+        }
+
        partial void CreateConvexHull(Vector2 position, Vector2 size, float rotation)
        {
            if (!CastShadow) { return; }