(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
@@ -172,6 +172,11 @@ namespace Barotrauma
        {
            base.Select();

+            foreach (LevelObjectPrefab levelObjPrefab in LevelObjectPrefab.List)
+            {
+                levelObjPrefab.Sprite?.EnsureLazyLoaded();
+            }
+
            pointerLightSource = new LightSource(Vector2.Zero, 1000.0f, Color.White, submarine: null);
            GameMain.LightManager.AddLight(pointerLightSource);
            topPanel.ClearChildren();