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

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 00ef5aa0cc6a69e5ff45e9db4fe71c6784e910ae..4b87246c765ecf6117d85ec43c863f619a1e2221 100644 (file)
--- 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;