From: havoc <havoc@d7cf8633-e32d-0410-b094-e92efae38249>
Date: Tue, 29 Jan 2008 04:24:23 +0000 (+0000)
Subject: fix bug with r_glsl 1;r_hdr 1;r_bloom 0 that made the screen white
X-Git-Tag: xonotic-v0.1.0preview~2478
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=9d92338c554eeb437467b0df2e05fcca778a6dde;p=xonotic%2Fdarkplaces.git

fix bug with r_glsl 1;r_hdr 1;r_bloom 0 that made the screen white


git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@8036 d7cf8633-e32d-0410-b094-e92efae38249
---

diff --git a/gl_rmain.c b/gl_rmain.c
index fc3ed276..b3e82aad 100644
--- a/gl_rmain.c
+++ b/gl_rmain.c
@@ -3076,7 +3076,7 @@ void R_Bloom_StartFrame(void)
 		Cvar_SetValueQuick(&r_bloom, 0);
 	}
 
-	if (!(r_glsl.integer && r_glsl_postprocess.integer) && !r_bloom.integer)
+	if (!(r_glsl.integer && (r_glsl_postprocess.integer || r_bloom.integer || r_hdr.integer)) && !r_bloom.integer)
 		screentexturewidth = screentextureheight = 0;
 	if (!r_hdr.integer && !r_bloom.integer)
 		bloomtexturewidth = bloomtextureheight = 0;