Merge branch 'master' into Glew_Version_For_Real

This commit is contained in:
Christoph Oelckers 2014-07-26 22:26:58 +02:00
commit e07d06fa2a

View file

@ -643,6 +643,8 @@ void FGLRenderer::DrawBlend(sector_t * viewsector)
void FGLRenderer::EndDrawScene(sector_t * viewsector)
{
gl_RenderState.EnableFog(false);
// [BB] HUD models need to be rendered here. Make sure that
// DrawPlayerSprites is only called once. Either to draw
// HUD models or to draw the weapon sprites.
@ -657,7 +659,6 @@ void FGLRenderer::EndDrawScene(sector_t * viewsector)
glDisable(GL_STENCIL_TEST);
glDisable(GL_POLYGON_SMOOTH);
gl_RenderState.EnableFog(false);
framebuffer->Begin2D(false);
ResetViewport();