From: havoc <havoc@d7cf8633-e32d-0410-b094-e92efae38249>
Date: Thu, 6 Dec 2007 16:32:41 +0000 (+0000)
Subject: fix mistakes in the fix for the previous mistakes in default.glsl
X-Git-Tag: xonotic-v0.1.0preview~2718
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=e465df1714170122e13f7b684fec72c7de9972df;p=xonotic%2Fdarkplaces.git

fix mistakes in the fix for the previous mistakes in default.glsl


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

diff --git a/gl_rmain.c b/gl_rmain.c
index fa7f2acd..55484014 100644
--- a/gl_rmain.c
+++ b/gl_rmain.c
@@ -793,7 +793,7 @@ static const char *builtinshaderstring =
 "# endif\n"
 "\n"
 "	// apply lightmap color\n"
-"	color.rgb = tempcolor * myhvec3(texture2D(Texture_Lightmap, TexCoordLightmap)) * myhvec3(gl_Color) + color * AmbientScale;\n"
+"	color.rgb = color.rgb * AmbientScale + tempcolor * myhvec3(texture2D(Texture_Lightmap, TexCoordLightmap)) * myhvec3(gl_Color);\n"
 "	color.a *= myhalf(gl_Color.a);\n"
 "#endif // MODE_LIGHTDIRECTIONMAP_MODELSPACE\n"
 "\n"
@@ -815,7 +815,7 @@ static const char *builtinshaderstring =
 "# endif\n"
 "\n"
 "	// apply lightmap color\n"
-"	color.rgb = tempcolor * myhvec3(texture2D(Texture_Lightmap, TexCoordLightmap)) * myhvec3(gl_Color) + color * AmbientScale;\n"
+"	color.rgb = color.rgb * AmbientScale + tempcolor * myhvec3(texture2D(Texture_Lightmap, TexCoordLightmap)) * myhvec3(gl_Color);\n"
 "	color.a *= myhalf(gl_Color.a);\n"
 "#endif // MODE_LIGHTDIRECTIONMAP_TANGENTSPACE\n"
 "\n"