[iortcw] 253/497: All: Rend2: Fix wall marks

[Simon McVittie]

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

smcv pushed a commit to annotated tag 1.42d
in repository iortcw.

commit 5b08d181d060dc7d1e35e017176be8ee6c294a1a
Author: M4N4T4RMS at gmail.com <M4N4T4RMS at gmail.com@e65d2741-a53d-b2dc-ae96-bb75fa5e4c4a>
Date:   Thu Nov 20 22:50:09 2014 +0000

    All: Rend2: Fix wall marks
---
 MP/code/rend2/tr_marks.c   | 2 +-
 MP/code/rend2/tr_surface.c | 2 ++
 SP/code/rend2/tr_marks.c   | 2 +-
 SP/code/rend2/tr_surface.c | 2 ++
 4 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/MP/code/rend2/tr_marks.c b/MP/code/rend2/tr_marks.c
index 3134a15..111d429 100644
--- a/MP/code/rend2/tr_marks.c
+++ b/MP/code/rend2/tr_marks.c
@@ -189,7 +189,7 @@ void R_BoxSurfaces_r( mnode_t *node, vec3_t mins, vec3_t maxs, surfaceType_t **l
 			s = BoxOnPlaneSide( mins, maxs, &surf->cullinfo.plane );
 			if ( s == 1 || s == 2 ) {
 				*surfViewCount = tr.viewCount;
-			} else if (DotProduct(surf->cullinfo.plane.normal, dir) > -0.5) {
+			} else if (DotProduct(surf->cullinfo.plane.normal, dir) < -0.5) {
 				// don't add faces that make sharp angles with the projection direction
 					*surfViewCount = tr.viewCount;
 			}
diff --git a/MP/code/rend2/tr_surface.c b/MP/code/rend2/tr_surface.c
index d2e9ba2..19c036b 100644
--- a/MP/code/rend2/tr_surface.c
+++ b/MP/code/rend2/tr_surface.c
@@ -311,6 +311,8 @@ static void RB_SurfacePolychain( srfPoly_t *p ) {
 	int i;
 	int numv;
 
+	RB_CheckVao(tess.vao);
+
 	RB_CHECKOVERFLOW( p->numVerts, 3 * ( p->numVerts - 2 ) );
 
 	// fan triangles into the tess array
diff --git a/SP/code/rend2/tr_marks.c b/SP/code/rend2/tr_marks.c
index 7ca93cf..97e2b50 100644
--- a/SP/code/rend2/tr_marks.c
+++ b/SP/code/rend2/tr_marks.c
@@ -189,7 +189,7 @@ void R_BoxSurfaces_r( mnode_t *node, vec3_t mins, vec3_t maxs, surfaceType_t **l
 			s = BoxOnPlaneSide( mins, maxs, &surf->cullinfo.plane );
 			if ( s == 1 || s == 2 ) {
 				*surfViewCount = tr.viewCount;
-			} else if (DotProduct(surf->cullinfo.plane.normal, dir) > -0.5) {
+			} else if (DotProduct(surf->cullinfo.plane.normal, dir) < -0.5) {
 				// don't add faces that make sharp angles with the projection direction
 				*surfViewCount = tr.viewCount;
 			}
diff --git a/SP/code/rend2/tr_surface.c b/SP/code/rend2/tr_surface.c
index 3dabab5..085a555 100644
--- a/SP/code/rend2/tr_surface.c
+++ b/SP/code/rend2/tr_surface.c
@@ -311,6 +311,8 @@ static void RB_SurfacePolychain( srfPoly_t *p ) {
 	int i;
 	int numv;
 
+	RB_CheckVao(tess.vao);
+
 	RB_CHECKOVERFLOW( p->numVerts, 3 * ( p->numVerts - 2 ) );
 
 	// fan triangles into the tess array

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