(22b95f75c) Merge branch 'dev' of github.com:Regalis11/Barotrauma-development into dev

2019-05-16 06:32:55 +03:00
parent 9f87239724
commit c2e039be19
12 changed files with 168 additions and 303 deletions
@@ -574,6 +574,8 @@ namespace Barotrauma

        private GUILayoutGroup subPreviewContainer;

+        private GUILayoutGroup subPreviewContainer;
+
        private GUIButton loadGameButton;
        
        public Action<Submarine, string, string> StartNewGame;
@@ -789,10 +789,6 @@ namespace Barotrauma

            GUI.Draw(Cam, spriteBatch);

-            spriteBatch.Begin(SpriteSortMode.Deferred, null, null, null, GameMain.ScissorTestEnable);
-
-            GUI.Draw(Cam, spriteBatch);
-
            GUI.Draw(Cam, spriteBatch);
            
 #if DEBUG