]> git.rm.cloudns.org Git - xonotic/darkplaces.git/commitdiff
fix a typo in default deluxemap setup
authordivverent <divverent@d7cf8633-e32d-0410-b094-e92efae38249>
Fri, 21 May 2010 11:57:57 +0000 (11:57 +0000)
committerRudolf Polzer <divverent@alientrap.org>
Fri, 21 May 2010 21:11:21 +0000 (23:11 +0200)
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10207 d7cf8633-e32d-0410-b094-e92efae38249
::stable-branch::merge=ce0b0f29d2fda06126651b78fb04a5741a1f6f75

gl_rmain.c

index 5704096dbd334025a043b944da13548a7f8bf667..ba58be6a2124b024c8e890e35dcf5f07e78f1a63 100644 (file)
@@ -5144,7 +5144,7 @@ void R_SetupShader_Surface(const vec3_t lightcolorbase, qboolean modellighting,
                if (r_glsl_permutation->loc_Texture_FogHeightTexture>= 0) R_Mesh_TexBind(GL20TU_FOGHEIGHTTEXTURE  , r_texture_fogheighttexture                          );
                if (r_glsl_permutation->loc_Texture_FogMask         >= 0) R_Mesh_TexBind(GL20TU_FOGMASK           , r_texture_fogattenuation                            );
                if (r_glsl_permutation->loc_Texture_Lightmap        >= 0) R_Mesh_TexBind(GL20TU_LIGHTMAP          , r_texture_white                                     );
-               if (r_glsl_permutation->loc_Texture_Deluxemap       >= 0) R_Mesh_TexBind(GL20TU_LIGHTMAP          , r_texture_blanknormalmap                            );
+               if (r_glsl_permutation->loc_Texture_Deluxemap       >= 0) R_Mesh_TexBind(GL20TU_DELUXEMAP         , r_texture_blanknormalmap                            );
                if (r_glsl_permutation->loc_Texture_Attenuation     >= 0) R_Mesh_TexBind(GL20TU_ATTENUATION       , r_shadow_attenuationgradienttexture                 );
                if (r_glsl_permutation->loc_Texture_Refraction      >= 0) R_Mesh_TexBind(GL20TU_REFRACTION        , r_texture_white                                     );
                if (r_glsl_permutation->loc_Texture_Reflection      >= 0) R_Mesh_TexBind(GL20TU_REFLECTION        , r_texture_white                                     );