From: havoc <havoc@d7cf8633-e32d-0410-b094-e92efae38249>
Date: Sun, 2 Dec 2007 13:33:08 +0000 (+0000)
Subject: fix r_waterscroll
X-Git-Tag: xonotic-v0.1.0preview~2737
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=469aa555fbde717ff0c8f2496f5990afe291e3ec;p=xonotic%2Fdarkplaces.git

fix r_waterscroll


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

diff --git a/gl_rmain.c b/gl_rmain.c
index b1b1bd0e..8cdee0a5 100644
--- a/gl_rmain.c
+++ b/gl_rmain.c
@@ -4076,6 +4076,11 @@ void R_UpdateTextureInfo(const entity_render_t *ent, texture_t *t)
 	if (t->backgroundnumskinframes && !(t->currentmaterialflags & MATERIALFLAGMASK_DEPTHSORTED))
 		t->currentmaterialflags |= MATERIALFLAG_VERTEXTEXTUREBLEND;
 
+	// make sure that the waterscroll matrix is used on water surfaces when
+	// there is no tcmod
+	if (t->currentmaterialflags & MATERIALFLAG_WATER && r_waterscroll.value != 0)
+		t->currenttexmatrix = r_waterscrollmatrix;
+
 	for (i = 0, tcmod = t->tcmods;i < Q3MAXTCMODS && tcmod->tcmod;i++, tcmod++)
 	{
 		matrix4x4_t matrix;