From: havoc <havoc@d7cf8633-e32d-0410-b094-e92efae38249>
Date: Tue, 13 Jun 2006 13:09:23 +0000 (+0000)
Subject: changed r_gls_deluxemapping 2 to not attempt to do fake deluxemapping on vertex lit... 
X-Git-Tag: xonotic-v0.1.0preview~3902
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=c75552f33e81437a35ff282c2cde22d91017ebb9;p=xonotic%2Fdarkplaces.git

changed r_gls_deluxemapping 2 to not attempt to do fake deluxemapping on vertex lit surfaces


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

diff --git a/gl_rmain.c b/gl_rmain.c
index 00ef5aa0..4b87246c 100644
--- a/gl_rmain.c
+++ b/gl_rmain.c
@@ -791,9 +791,9 @@ int R_SetupSurfaceShader(const vec3_t lightcolorbase, qboolean modellighting)
 		{
 			if (modellighting)
 				permutation |= SHADERPERMUTATION_MODE_LIGHTDIRECTION;
-			else
+			else if (r_glsl_deluxemapping.integer >= 1 && rsurface_lightmaptexture)
 			{
-				if (r_glsl_deluxemapping.integer >= 1 && r_refdef.worldmodel && r_refdef.worldmodel->brushq3.deluxemapping && rsurface_lightmaptexture)
+				if (r_refdef.worldmodel && r_refdef.worldmodel->brushq3.deluxemapping)
 				{
 					if (r_refdef.worldmodel->brushq3.deluxemapping_modelspace)
 						permutation |= SHADERPERMUTATION_MODE_LIGHTDIRECTIONMAP_MODELSPACE;