]> git.rm.cloudns.org Git - xonotic/darkplaces.git/commitdiff
fix bug with r_glsl 1;r_hdr 1;r_bloom 0 that made the screen white
authorhavoc <havoc@d7cf8633-e32d-0410-b094-e92efae38249>
Tue, 29 Jan 2008 04:24:23 +0000 (04:24 +0000)
committerhavoc <havoc@d7cf8633-e32d-0410-b094-e92efae38249>
Tue, 29 Jan 2008 04:24:23 +0000 (04:24 +0000)
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@8036 d7cf8633-e32d-0410-b094-e92efae38249

gl_rmain.c

index fc3ed27620245e9611747c24efdd2682d543002f..b3e82aad84e588f4c0c4b9dc2e3e66b42f84de63 100644 (file)
@@ -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;