From: havoc <havoc@d7cf8633-e32d-0410-b094-e92efae38249>
Date: Tue, 25 Sep 2007 19:23:39 +0000 (+0000)
Subject: attempt to fix unintentionally forced gloss problems
X-Git-Tag: xonotic-v0.1.0preview~2889
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=5e555cbc4cbd3163d87444c988e750bdc38c9652;p=xonotic%2Fdarkplaces.git

attempt to fix unintentionally forced gloss problems


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

diff --git a/gl_rmain.c b/gl_rmain.c
index 5b13ce7b..47b4c265 100644
--- a/gl_rmain.c
+++ b/gl_rmain.c
@@ -3835,9 +3835,9 @@ void R_UpdateTextureInfo(const entity_render_t *ent, texture_t *t)
 
 	t->colormapping = VectorLength2(ent->colormap_pantscolor) + VectorLength2(ent->colormap_shirtcolor) >= (1.0f / 1048576.0f);
 	t->basetexture = (!t->colormapping && t->currentskinframe->merged) ? t->currentskinframe->merged : t->currentskinframe->base;
-	t->glosstexture = r_texture_white;
+	t->glosstexture = r_texture_black;
 	t->backgroundbasetexture = t->backgroundnumskinframes ? ((!t->colormapping && t->backgroundcurrentskinframe->merged) ? t->backgroundcurrentskinframe->merged : t->backgroundcurrentskinframe->base) : r_texture_white;
-	t->backgroundglosstexture = r_texture_white;
+	t->backgroundglosstexture = r_texture_black;
 	t->specularpower = r_shadow_glossexponent.value;
 	// TODO: store reference values for these in the texture?
 	t->specularscale = 0;
@@ -3853,7 +3853,11 @@ void R_UpdateTextureInfo(const entity_render_t *ent, texture_t *t)
 			}
 		}
 		else if (r_shadow_gloss.integer >= 2 && r_shadow_gloss2intensity.value > 0)
+		{
+			t->glosstexture = r_texture_white;
+			t->backgroundglosstexture = r_texture_white;
 			t->specularscale = r_shadow_gloss2intensity.value;
+		}
 	}
 
 	// lightmaps mode looks bad with dlights using actual texturing, so turn