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 b1b1bd0e80ba6a407525c984c40ea4d29cec988b..8cdee0a51b86753de3f0ebba3f356c65ddaaaa31 100644 (file)
--- 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;