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

2019-05-16 05:50:56 +03:00
parent fd7dfebd3a
commit 884360216f
45 changed files with 1679 additions and 1563 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