From: havoc Date: Sun, 23 Apr 2017 22:53:08 +0000 (+0000) Subject: Fix bug where r_showbboxes broke bloom texture updates by setting GL_CullFace in... X-Git-Tag: xonotic-v0.8.5~83 X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=135e0beb0c30b770396161df034c0e5e0c100c04;p=xonotic%2Fdarkplaces.git Fix bug where r_showbboxes broke bloom texture updates by setting GL_CullFace in R_Bloom_MakeTexture. git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@12332 d7cf8633-e32d-0410-b094-e92efae38249 ::stable-branch::merge=c1878bd6bc94e9e53a1eeef0db5cd001f97f79f4 --- diff --git a/gl_rmain.c b/gl_rmain.c index 8bf14a8a..92e0d76c 100644 --- a/gl_rmain.c +++ b/gl_rmain.c @@ -6625,6 +6625,7 @@ static void R_Bloom_MakeTexture(void) r_fb.bloomindex = 0; R_Mesh_SetRenderTargets(r_fb.bloomfbo[r_fb.bloomindex], NULL, r_fb.bloomtexture[r_fb.bloomindex], NULL, NULL, NULL); R_SetViewport(&r_fb.bloomviewport); + GL_CullFace(GL_NONE); GL_DepthTest(false); GL_BlendFunc(GL_ONE, GL_ZERO); GL_Color(colorscale, colorscale, colorscale, 1);