(fb180d412) Merge branch 'dev' into human-ai

2019-05-16 06:17:45 +03:00
parent 2f0bd98f8f
commit 8b977ed5c0
23 changed files with 425 additions and 150 deletions
@@ -789,6 +789,10 @@ 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