]> de.git.xonotic.org Git - xonotic/darkplaces.git/commitdiff
possible bugfix for r_water bugs introduced recently
authorhavoc <havoc@d7cf8633-e32d-0410-b094-e92efae38249>
Fri, 2 Oct 2009 09:44:41 +0000 (09:44 +0000)
committerhavoc <havoc@d7cf8633-e32d-0410-b094-e92efae38249>
Fri, 2 Oct 2009 09:44:41 +0000 (09:44 +0000)
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@9280 d7cf8633-e32d-0410-b094-e92efae38249

gl_rmain.c

index 9c9b8e4a498d8cc391b1668fda219d9e1258a58d..0294e451caa4c893522c44c3f908f605adf5ef9b 100644 (file)
@@ -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;