(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
@@ -126,7 +126,7 @@ namespace Barotrauma
                        CanChangeTo.Add(new LocationTypeChange(Identifier, subElement));
                        break;
                    case "portrait":
-                        var portrait = new Sprite(subElement);
+                        var portrait = new Sprite(subElement, lazyLoad: true);
                        if (portrait != null)
                        {
                            portraits.Add(portrait);