client no longer tries to download missing files from server if it is hosting the...

[xonotic/darkplaces.git] / gl_rmain.c

diff --git a/gl_rmain.c b/gl_rmain.c
index af26ca6f5f865ecb1c631edece1195748dd8c67b..3ca1f219a3e1376d451c599d8a83e1efb7616ef2 100644 (file)
--- a/gl_rmain.c
+++ b/gl_rmain.c
@@ -2484,13 +2484,14 @@ static void R_Texture_AddLayer(texture_t *t, qboolean depthmask, int blendfunc1,
 
 void R_UpdateTextureInfo(const entity_render_t *ent, texture_t *t)
 {
+       model_t *model = ent->model;
+
        // FIXME: identify models using a better check than ent->model->brush.shadowmesh
        //int lightmode = ((ent->effects & EF_FULLBRIGHT) || ent->model->brush.shadowmesh) ? 0 : 2;
 
        // switch to an alternate material if this is a q1bsp animated material
        {
                texture_t *texture = t;
-               model_t *model = ent->model;
                int s = ent->skinnum;
                if ((unsigned int)s >= (unsigned int)model->numskins)
                        s = 0;
@@ -2521,7 +2522,7 @@ void R_UpdateTextureInfo(const entity_render_t *ent, texture_t *t)
 
        t->currentmaterialflags = t->basematerialflags;
        t->currentalpha = ent->alpha;
-       if (t->basematerialflags & MATERIALFLAG_WATERALPHA)
+       if (t->basematerialflags & MATERIALFLAG_WATERALPHA && (model->brush.supportwateralpha || r_novis.integer))
                t->currentalpha *= r_wateralpha.value;
        if (!(ent->flags & RENDER_LIGHT))
                t->currentmaterialflags |= MATERIALFLAG_FULLBRIGHT;