(07016aa31) Merge branch 'dev' of https://github.com/Regalis11/Barotrauma-development into dev

2019-05-16 06:11:48 +03:00
parent e66501d96a
commit 68b3e2eb07
13 changed files with 154 additions and 292 deletions
@@ -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