Merge branch 'master' of https://bitbucket.org/Regalis11/repo

Conflicts: Subsurface_Solution.v12.suo
2015-06-21 22:48:36 +03:00
parent 24ba9b1b98 b45073fdec
commit 2c4eb52d41
8 changed files with 1271 additions and 1 deletions
@@ -183,6 +183,8 @@ namespace Subsurface
                BlendState.AlphaBlend,
                null, null, null, null,
                cam.Transform);
+
+            if (Game1.Level!=null) Game1.Level.Render(spriteBatch);
                        
            Map.DrawBack(spriteBatch);