From: havoc <havoc@d7cf8633-e32d-0410-b094-e92efae38249>
Date: Tue, 16 Aug 2011 08:19:35 +0000 (+0000)
Subject: don't draw bouncegrid on custom csqc scenes without drawworld
X-Git-Tag: xonotic-v0.5.0~46
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=ad38b44d3f7b8e214d0e6d78c730f590f8b11c82;p=xonotic%2Fdarkplaces.git

don't draw bouncegrid on custom csqc scenes without drawworld

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@11275 d7cf8633-e32d-0410-b094-e92efae38249
::stable-branch::merge=4e82f39f2505c30be145c98de8bb8aa166c6858c
---

diff --git a/gl_rmain.c b/gl_rmain.c
index 85c2357b..435cefe5 100644
--- a/gl_rmain.c
+++ b/gl_rmain.c
@@ -2331,7 +2331,7 @@ void R_SetupShader_Surface(const vec3_t lightcolorbase, qboolean modellighting,
 			permutation |= SHADERPERMUTATION_DEFERREDLIGHTMAP;
 		if (rsurface.texture->reflectmasktexture)
 			permutation |= SHADERPERMUTATION_REFLECTCUBE;
-		if (r_shadow_bouncegridtexture)
+		if (r_shadow_bouncegridtexture && cl.csqc_vidvars.drawworld)
 		{
 			permutation |= SHADERPERMUTATION_BOUNCEGRID;
 			if (r_shadow_bouncegriddirectional)
@@ -2391,7 +2391,7 @@ void R_SetupShader_Surface(const vec3_t lightcolorbase, qboolean modellighting,
 			permutation |= SHADERPERMUTATION_DEFERREDLIGHTMAP;
 		if (rsurface.texture->reflectmasktexture)
 			permutation |= SHADERPERMUTATION_REFLECTCUBE;
-		if (r_shadow_bouncegridtexture)
+		if (r_shadow_bouncegridtexture && cl.csqc_vidvars.drawworld)
 		{
 			permutation |= SHADERPERMUTATION_BOUNCEGRID;
 			if (r_shadow_bouncegriddirectional)
@@ -2490,7 +2490,7 @@ void R_SetupShader_Surface(const vec3_t lightcolorbase, qboolean modellighting,
 			// ordinary vertex coloring (q3bsp)
 			mode = SHADERMODE_VERTEXCOLOR;
 		}
-		if (r_shadow_bouncegridtexture)
+		if (r_shadow_bouncegridtexture && cl.csqc_vidvars.drawworld)
 		{
 			permutation |= SHADERPERMUTATION_BOUNCEGRID;
 			if (r_shadow_bouncegriddirectional)