added r_renderview cvar (similar to scr_refresh but disables only 3D

[xonotic/darkplaces.git] / gl_rmain.c

diff --git a/gl_rmain.c b/gl_rmain.c
index 0294e451caa4c893522c44c3f908f605adf5ef9b..f11963bd0ee269a232e8ed028fe771c9cd28c23f 100644 (file)
--- a/gl_rmain.c
+++ b/gl_rmain.c
@@ -3709,7 +3709,7 @@ static void R_Water_StartFrame(void)
                r_waterstate.textureheight = textureheight;
        }
 
-       if (r_waterstate.waterwidth)
+       if (r_waterstate.texturewidth)
        {
                r_waterstate.enabled = true;
 
@@ -4600,7 +4600,7 @@ void R_RenderView(void)
                return;
        }
 
-       if (!r_refdef.scene.entities || r_refdef.view.width * r_refdef.view.height == 0/* || !r_refdef.scene.worldmodel*/)
+       if (!r_refdef.scene.entities || r_refdef.view.width * r_refdef.view.height == 0 || !r_renderview.integer/* || !r_refdef.scene.worldmodel*/)
                return; //Host_Error ("R_RenderView: NULL worldmodel");
 
        r_refdef.view.colorscale = r_hdr_scenebrightness.value;