From: divverent <divverent@d7cf8633-e32d-0410-b094-e92efae38249>
Date: Fri, 28 Nov 2008 16:48:36 +0000 (+0000)
Subject: move texture compression disabling and picmip into LookupQ3Shader, based on the defau... 
X-Git-Tag: xonotic-v0.1.0preview~2029
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=a9acdb17f88adf4ac412f91a2bdb29ef830cf139;p=xonotic%2Fdarkplaces.git

move texture compression disabling and picmip into LookupQ3Shader, based on the default flags that are used for shaderless textures. Reason: playermodels by leileilol used Q3 shaders, which made them exempt from picmip if r_picmipworld is used.


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

diff --git a/model_shared.c b/model_shared.c
index 1af201d7..12bcad7b 100644
--- a/model_shared.c
+++ b/model_shared.c
@@ -1484,7 +1484,7 @@ void Mod_LoadQ3Shaders(void)
 					layer->texflags = TEXF_ALPHA | TEXF_PRECACHE;
 					if (!(shader.surfaceparms & Q3SURFACEPARM_NOMIPMAPS))
 						layer->texflags |= TEXF_MIPMAP;
-					if (!(shader.textureflags & Q3TEXTUREFLAG_NOPICMIP) && (r_picmipworld.integer || (layer->texturename && layer->texturename[0] && strncmp(layer->texturename[0], "textures/", 9))))
+					if (!(shader.textureflags & Q3TEXTUREFLAG_NOPICMIP))
 						layer->texflags |= TEXF_PICMIP | TEXF_COMPRESS;
 					if (layer->clampmap)
 						layer->texflags |= TEXF_CLAMP;
@@ -1736,6 +1736,13 @@ qboolean Mod_LoadTextureFromQ3Shader(texture_t *texture, const char *name, qbool
 			Con_Printf("%s: loaded shader for %s\n", loadmodel->name, name);
 		texture->surfaceparms = shader->surfaceparms;
 		texture->textureflags = shader->textureflags;
+
+		// allow disabling of picmip or compression by defaulttexflags
+		if(!(defaulttexflags & TEXF_PICMIP))
+			texture->textureflags &= ~TEXF_PICMIP;
+		if(!(defaulttexflags & TEXF_COMPRESS))
+			texture->textureflags &= ~TEXF_COMPRESS;
+
 		texture->basematerialflags = 0;
 		if (shader->surfaceparms & Q3SURFACEPARM_SKY)
 		{