From: havoc <havoc@d7cf8633-e32d-0410-b094-e92efae38249>
Date: Tue, 5 Oct 2004 17:52:06 +0000 (+0000)
Subject: only enable watershader on fullbright water
X-Git-Tag: xonotic-v0.1.0preview~5519
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=3b60c1737c8ba2ba26312a6fde0838727d3ab9d7;p=xonotic%2Fdarkplaces.git

only enable watershader on fullbright water


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

diff --git a/gl_rsurf.c b/gl_rsurf.c
index a456e57d..209acfc0 100644
--- a/gl_rsurf.c
+++ b/gl_rsurf.c
@@ -832,7 +832,7 @@ static void RSurfShader_Transparent_Callback(const void *calldata1, int calldata
 	base = fullbright ? 2.0f : r_ambient.value * (1.0f / 64.0f);
 	if (surf->flags & SURF_DRAWTURB)
 		base *= 0.5f;
-	if ((surf->flags & SURF_DRAWTURB) && gl_textureshader && r_watershader.value && !fogenabled)
+	if ((surf->flags & SURF_DRAWTURB) && gl_textureshader && r_watershader.value && !fogenabled && fullbright)
 	{
 		// NVIDIA Geforce3 distortion texture shader on water
 		GL_Color(1, 1, 1, currentalpha);