From 872465500e6952a611306f5c790ae7626ab73a27 Mon Sep 17 00:00:00 2001
From: Zack Middleton <zturtleman@gmail.com>
Date: Thu, 20 Jun 2013 16:22:40 -0500
Subject: [PATCH] Fix r_nocurves in OpenGL2 renderer

Check r_nocurves in surface cull.
While r_nocurves is enabled, don't use merged surfaces because merged curves would be renderer. (note: surface merging is enabled by r_mergeLeafSurfaces)
---
 code/renderergl2/tr_world.c | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/code/renderergl2/tr_world.c b/code/renderergl2/tr_world.c
index 5159a659..e67be16f 100644
--- a/code/renderergl2/tr_world.c
+++ b/code/renderergl2/tr_world.c
@@ -36,6 +36,10 @@ static qboolean	R_CullSurface( msurface_t *surf ) {
 		return qfalse;
 	}
 
+	if ( *surf->data == SF_GRID && r_nocurves->integer ) {
+		return qtrue;
+	}
+
 	if (surf->cullinfo.type & CULLINFO_PLANE)
 	{
 		// Only true for SF_FACE, so treat like its own function
@@ -554,7 +558,7 @@ static void R_RecursiveWorldNode( mnode_t *node, int planeBits, int dlightBits,
 		}
 
 		// add merged and unmerged surfaces
-		if (tr.world->viewSurfaces)
+		if (tr.world->viewSurfaces && !r_nocurves->integer)
 			view = tr.world->viewSurfaces + node->firstmarksurface;
 		else
 			view = tr.world->marksurfaces + node->firstmarksurface;