(4ca668169) Fixed: Conflict

2019-05-16 05:58:48 +03:00
parent 0a67590572
commit cb83984e80
80 changed files with 2036 additions and 1859 deletions
@@ -76,8 +76,8 @@ namespace Barotrauma

        partial void InitProjSpecific()
        {
-            Prefab.Sprite?.EnsureLazyLoaded();
-            Prefab.SpecularSprite?.EnsureLazyLoaded();
+            Sprite?.EnsureLazyLoaded();
+            SpecularSprite?.EnsureLazyLoaded();
            Prefab.DeformableSprite?.EnsureLazyLoaded();

            CurrentSwingAmount = Prefab.SwingAmountRad;