From: havoc <havoc@d7cf8633-e32d-0410-b094-e92efae38249>
Date: Sat, 30 Jan 2010 23:26:56 +0000 (+0000)
Subject: fix r_drawviewmodel
X-Git-Tag: xonotic-v0.1.0preview~230^2~575
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=b8be74b1802b422cc09c8dc11d5da9b17d22f2ad;p=xonotic%2Fdarkplaces.git

fix r_drawviewmodel


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

diff --git a/gl_rmain.c b/gl_rmain.c
index 6e677973..09423951 100644
--- a/gl_rmain.c
+++ b/gl_rmain.c
@@ -6712,6 +6712,7 @@ 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)