From: havoc <havoc@d7cf8633-e32d-0410-b094-e92efae38249>
Date: Fri, 2 Oct 2009 09:44:41 +0000 (+0000)
Subject: possible bugfix for r_water bugs introduced recently
X-Git-Tag: xonotic-v0.1.0preview~1353
X-Git-Url: http://de.git.xonotic.org/?a=commitdiff_plain;h=ed3db2e8a2a713ecb8c1cac1a767be12037d1411;p=xonotic%2Fdarkplaces.git

possible bugfix for r_water bugs introduced recently


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

diff --git a/gl_rmain.c b/gl_rmain.c
index 9c9b8e4a..0294e451 100644
--- a/gl_rmain.c
+++ b/gl_rmain.c
@@ -3709,14 +3709,14 @@ static void R_Water_StartFrame(void)
 		r_waterstate.textureheight = textureheight;
 	}
 
-	// when doing a reduced render (HDR) we want to use a smaller area
-	r_waterstate.waterwidth = (int)bound(1, r_refdef.view.width * r_water_resolutionmultiplier.value, r_refdef.view.width);
-	r_waterstate.waterheight = (int)bound(1, r_refdef.view.height * r_water_resolutionmultiplier.value, r_refdef.view.height);
-
 	if (r_waterstate.waterwidth)
 	{
 		r_waterstate.enabled = true;
 
+		// when doing a reduced render (HDR) we want to use a smaller area
+		r_waterstate.waterwidth = (int)bound(1, r_refdef.view.width * r_water_resolutionmultiplier.value, r_refdef.view.width);
+		r_waterstate.waterheight = (int)bound(1, r_refdef.view.height * r_water_resolutionmultiplier.value, r_refdef.view.height);
+
 		// set up variables that will be used in shader setup
 		r_waterstate.screenscale[0] = 0.5f * (float)r_waterstate.waterwidth / (float)r_waterstate.texturewidth;
 		r_waterstate.screenscale[1] = 0.5f * (float)r_waterstate.waterheight / (float)r_waterstate.textureheight;