From: havoc <havoc@d7cf8633-e32d-0410-b094-e92efae38249>
Date: Sat, 30 Jan 2010 23:28:10 +0000 (+0000)
Subject: better fix for r_drawviewmodel
X-Git-Tag: xonotic-v0.1.0preview~230^2~574
X-Git-Url: http://git.xonotic.org/?a=commitdiff_plain;ds=sidebyside;h=a619da644cb1e9886812682c678b78fca67f8da9;p=xonotic%2Fdarkplaces.git

better fix for r_drawviewmodel


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

diff --git a/gl_rmain.c b/gl_rmain.c
index 09423951..d72a3194 100644
--- a/gl_rmain.c
+++ b/gl_rmain.c
@@ -6702,6 +6702,8 @@ static void R_View_UpdateEntityVisible (void)
 	entity_render_t *ent;
 
 	renderimask = r_refdef.envmap ? (RENDER_EXTERIORMODEL | RENDER_VIEWMODEL) : ((chase_active.integer || r_waterstate.renderingscene) ? RENDER_VIEWMODEL : RENDER_EXTERIORMODEL);
+	if (!r_drawviewmodel.integer)
+		renderimask |= RENDER_VIEWMODEL;
 	if (r_refdef.scene.worldmodel && r_refdef.scene.worldmodel->brush.BoxTouchingVisibleLeafs)
 	{
 		// worldmodel can check visibility
@@ -6712,7 +6714,6 @@ static void R_View_UpdateEntityVisible (void)
 			if (!(ent->flags & renderimask))
 			if (!R_CullBox(ent->mins, ent->maxs) || (ent->model->type == mod_sprite && (ent->model->sprite.sprnum_type == SPR_LABEL || ent->model->sprite.sprnum_type == SPR_LABEL_SCALE)))
 			if ((ent->flags & (RENDER_NODEPTHTEST | RENDER_VIEWMODEL)) || r_refdef.scene.worldmodel->brush.BoxTouchingVisibleLeafs(r_refdef.scene.worldmodel, r_refdef.viewcache.world_leafvisible, ent->mins, ent->maxs))
-			if (!(ent->flags & (RENDER_VIEWMODEL)) || r_drawviewmodel.integer)
 				r_refdef.viewcache.entityvisible[i] = true;
 		}
 		if(r_cullentities_trace.integer && r_refdef.scene.worldmodel->brush.TraceLineOfSight)