[iortcw] 05/95: All: Rend2: Don't draw viewmodels in portal views Thanks Cyrax for pointing out, should fix https://bugzilla.icculus.org/show_bug.cgi?id=6363

[Simon McVittie]

This is an automated email from the git hooks/post-receive script.

smcv pushed a commit to tag 1.51
in repository iortcw.

commit 2deaffe3a970b56f3f5b2061f7d47367c830c260
Author: MAN-AT-ARMS <M4N4T4RMS at gmail.com>
Date:   Tue Nov 29 08:31:21 2016 -0500

    All: Rend2: Don't draw viewmodels in portal views
    Thanks Cyrax for pointing out, should fix https://bugzilla.icculus.org/show_bug.cgi?id=6363
---
 MP/code/rend2/tr_main.c | 4 ++--
 SP/code/rend2/tr_main.c | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/MP/code/rend2/tr_main.c b/MP/code/rend2/tr_main.c
index 1350aa0..6d85f68 100644
--- a/MP/code/rend2/tr_main.c
+++ b/MP/code/rend2/tr_main.c
@@ -1514,8 +1514,8 @@ qboolean R_MirrorViewBySurface( drawSurf_t *drawSurf, int entityNum ) {
 		return qfalse;      // bad portal, no portalentity
 	}
 
-	if (newParms.isMirror)
-		newParms.flags |= VPF_NOVIEWMODEL;
+	// Never draw viewmodels in portal or mirror views.
+	newParms.flags |= VPF_NOVIEWMODEL;
 
 	R_MirrorPoint( oldParms.or.origin, &surface, &camera, newParms.or.origin );
 
diff --git a/SP/code/rend2/tr_main.c b/SP/code/rend2/tr_main.c
index 174d8e3..8f94895 100644
--- a/SP/code/rend2/tr_main.c
+++ b/SP/code/rend2/tr_main.c
@@ -1548,8 +1548,8 @@ qboolean R_MirrorViewBySurface( drawSurf_t *drawSurf, int entityNum ) {
 		return qfalse;      // bad portal, no portalentity
 	}
 
-	if (newParms.isMirror)
-		newParms.flags |= VPF_NOVIEWMODEL;
+	// Never draw viewmodels in portal or mirror views.
+	newParms.flags |= VPF_NOVIEWMODEL;
 
 	R_MirrorPoint( oldParms.or.origin, &surface, &camera, newParms.or.origin );
 

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/iortcw.git