From: havoc <havoc@d7cf8633-e32d-0410-b094-e92efae38249>
Date: Fri, 9 Mar 2012 04:48:02 +0000 (+0000)
Subject: fixed a severely bugged check of R_BlendFuncFlags
X-Git-Tag: xonotic-v0.7.0~212
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=50dfce2b668319226289220a09300621850184c8;p=xonotic%2Fdarkplaces.git

fixed a severely bugged check of R_BlendFuncFlags
removed a redundant lightmap update loop
thanks to Klaus Silveira for pointing out these issues

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@11748 d7cf8633-e32d-0410-b094-e92efae38249
::stable-branch::merge=1b2f7e565129f79901e2b4d82954aca65e4d1b5e
---

diff --git a/gl_rmain.c b/gl_rmain.c
index 96c2c8a4..e835edbf 100644
--- a/gl_rmain.c
+++ b/gl_rmain.c
@@ -7989,7 +7989,7 @@ texture_t *R_GetCurrentTexture(texture_t *t)
 			blendfunc2 = GL_ZERO;
 		}
 		// don't colormod evilblend textures
-		if(!R_BlendFuncFlags(blendfunc1, blendfunc2) & BLENDFUNC_ALLOWS_COLORMOD)
+		if(!(R_BlendFuncFlags(blendfunc1, blendfunc2) & BLENDFUNC_ALLOWS_COLORMOD))
 			VectorSet(t->lightmapcolor, 1, 1, 1);
 		depthmask = !(t->currentmaterialflags & MATERIALFLAG_BLENDED);
 		if (t->currentmaterialflags & MATERIALFLAG_FULLBRIGHT)
@@ -11812,10 +11812,7 @@ void R_DrawModelSurfaces(entity_render_t *ent, qboolean skysurfaces, qboolean wr
 			}
 		}
 	}
-	if (update)
-		for (j = model->firstmodelsurface, endj = model->firstmodelsurface + model->nummodelsurfaces;j < endj;j++)
-			if (update[j])
-				R_BuildLightMap(ent, surfaces + j);
+
 	R_QueueModelSurfaceList(ent, numsurfacelist, r_surfacelist, flagsmask, writedepth, depthonly, prepass);
 
 	// add to stats if desired