(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
--- a/Barotrauma/BarotraumaClient/Source/Map/Levels/LevelObjects/LevelObject.cs
+++ b/Barotrauma/BarotraumaClient/Source/Map/Levels/LevelObjects/LevelObject.cs
@@ -76,6 +76,10 @@ namespace Barotrauma

        partial void InitProjSpecific()
        {
+            Prefab.Sprite?.EnsureLazyLoaded();
+            Prefab.SpecularSprite?.EnsureLazyLoaded();
+            Prefab.DeformableSprite?.EnsureLazyLoaded();
+
            CurrentSwingAmount = Prefab.SwingAmountRad;
            CurrentScaleOscillation = Prefab.ScaleOscillation;