From: havoc <havoc@d7cf8633-e32d-0410-b094-e92efae38249>
Date: Sat, 30 Dec 2006 16:28:26 +0000 (+0000)
Subject: I don't know how this got committed
X-Git-Tag: xonotic-v0.1.0preview~3728
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=4f779cc71b416cfcac6290f6b616e58d65ef1730;p=xonotic%2Fdarkplaces.git

I don't know how this got committed


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

diff --git a/model_brush.c b/model_brush.c
index 12afaaeb..47765028 100644
--- a/model_brush.c
+++ b/model_brush.c
@@ -1264,7 +1264,6 @@ static void Mod_Q1BSP_LoadTextures(lump_t *l)
 		tx->skinframerate = 1;
 		tx->currentskinframe = tx->skinframes;
 		tx->skinframes[0].base = r_texture_notexture;
-		tx->backgroundcurrentskinframe = tx->backgroundskinframes;
 		tx->basematerialflags = 0;
 		if (i == loadmodel->num_textures - 1)
 		{
@@ -4397,15 +4396,6 @@ Q3 shader blendfuncs actually used in the game (* = supported by DP)
 					if (!Mod_LoadSkinFrame(&out->skinframes[j], shader->primarylayer->texturename[j], ((shader->surfaceparms & Q3SURFACEPARM_NOMIPMAPS) ? 0 : TEXF_MIPMAP) | TEXF_ALPHA | TEXF_PRECACHE | (shader->textureflags & Q3TEXTUREFLAG_NOPICMIP ? 0 : TEXF_PICMIP) | (shader->primarylayer->clampmap ? TEXF_CLAMP : 0), false, true))
 						Con_Printf("%s: could not load texture \"%s\" (frame %i) for shader \"%s\"\n", loadmodel->name, shader->primarylayer->texturename[j], j, out->name);
 			}
-			if (shader->backgroundlayer && cls.state != ca_dedicated)
-			{
-				int j;
-				out->backgroundnumskinframes = shader->backgroundlayer->numframes;
-				out->backgroundskinframerate = shader->backgroundlayer->framerate;
-				for (j = 0;j < shader->backgroundlayer->numframes;j++)
-					if (!Mod_LoadSkinFrame(&out->backgroundskinframes[j], shader->backgroundlayer->texturename[j], ((shader->surfaceparms & Q3SURFACEPARM_NOMIPMAPS) ? 0 : TEXF_MIPMAP) | TEXF_ALPHA | TEXF_PRECACHE | (shader->textureflags & Q3TEXTUREFLAG_NOPICMIP ? 0 : TEXF_PICMIP) | (shader->backgroundlayer->clampmap ? TEXF_CLAMP : 0), false, true))
-						Con_Printf("%s: could not load texture \"%s\" (frame %i) for shader \"%s\"\n", loadmodel->name, shader->backgroundlayer->texturename[j], j, out->name);
-			}
 		}
 		else
 		{
@@ -4433,7 +4423,6 @@ Q3 shader blendfuncs actually used in the game (* = supported by DP)
 		// init the animation variables
 		out->currentframe = out;
 		out->currentskinframe = &out->skinframes[0];
-		out->backgroundcurrentskinframe = &out->backgroundskinframes[0];
 	}
 	if (c)
 		Con_DPrintf("%s: %i textures missing shaders\n", loadmodel->name, c);