From: havoc <havoc@d7cf8633-e32d-0410-b094-e92efae38249>
Date: Mon, 30 May 2005 06:42:41 +0000 (+0000)
Subject: ignore RENDER_VIEWMODEL if tagentity is set
X-Git-Tag: xonotic-v0.1.0preview~4827
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=e9f0d9465730c8180f8d2c1caf29909dde150e47;p=xonotic%2Fdarkplaces.git

ignore RENDER_VIEWMODEL if tagentity is set


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

diff --git a/cl_main.c b/cl_main.c
index 00401515..dfca0cf7 100644
--- a/cl_main.c
+++ b/cl_main.c
@@ -587,7 +587,7 @@ void CL_LinkNetworkEntity(entity_t *e)
 			e->render.colormap = -1; // no special coloring
 		e->render.skinnum = e->state_current.skin;
 		VectorScale(e->state_current.colormod, (1.0f / 32.0f), e->render.colormod);
-		if (e->render.flags & RENDER_VIEWMODEL)
+		if (e->render.flags & RENDER_VIEWMODEL && !e->state_current.tagentity)
 		{
 			if (!r_drawviewmodel.integer || chase_active.integer || envmap)
 				return;