From: havoc <havoc@d7cf8633-e32d-0410-b094-e92efae38249>
Date: Sun, 24 Jan 2010 18:19:03 +0000 (+0000)
Subject: attempt to fix white flicker when r_water is toggled
X-Git-Tag: xonotic-v0.1.0preview~230^2~624
X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fdarkplaces.git;a=commitdiff_plain;h=115601248b48a32c5ab5a078a07a4e5f36ea7850;ds=sidebyside

attempt to fix white flicker when r_water is toggled


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

diff --git a/gl_rmain.c b/gl_rmain.c
index 3c6bd98f..aab6fd6b 100644
--- a/gl_rmain.c
+++ b/gl_rmain.c
@@ -7775,6 +7775,7 @@ void R_RenderView(void)
 {
 	if (r_timereport_active)
 		R_TimeReport("start");
+	r_textureframe++; // used only by R_GetCurrentTexture
 	rsurface.entity = NULL; // used only by R_GetCurrentTexture and RSurf_ActiveWorldEntity/RSurf_ActiveModelEntity
 
 	if (!r_drawentities.integer)
@@ -7834,7 +7835,11 @@ void R_RenderView(void)
 
 	// this produces a bloom texture to be used in R_BlendView() later
 	if (r_hdr.integer && r_bloomstate.bloomwidth)
+	{
 		R_HDR_RenderBloomTexture();
+		// we have to bump the texture frame again because r_refdef.view.colorscale is cached in the textures
+		r_textureframe++; // used only by R_GetCurrentTexture
+	}
 
 	r_refdef.view.showdebug = true;
 
@@ -7895,7 +7900,6 @@ extern qboolean r_shadow_usingdeferredprepass;
 void R_RenderScene(void)
 {
 	r_refdef.stats.renders++;
-	r_textureframe++; // used only by R_GetCurrentTexture
 
 	R_UpdateFogColor();