From: havoc Date: Tue, 24 Apr 2007 14:41:57 +0000 (+0000) Subject: fix bug that made all textures without a shader definition have X-Git-Tag: xonotic-v0.1.0preview~3266 X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fdarkplaces.git;a=commitdiff_plain;h=41f3bd4f251b018e270df28e2ee6099e575553a3 fix bug that made all textures without a shader definition have numskinframes = 0, which caused purging to eliminate their textures git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@7172 d7cf8633-e32d-0410-b094-e92efae38249 --- diff --git a/model_brush.c b/model_brush.c index 53191efd..352173ea 100644 --- a/model_brush.c +++ b/model_brush.c @@ -4583,12 +4583,15 @@ Q3 shader blendfuncs actually used in the game (* = supported by DP) // out->surfaceparms |= Q3SURFACEPARM_NODRAW; //if (R_TextureHasAlpha(out->skinframes[0].base)) // out->surfaceparms |= Q3SURFACEPARM_TRANS; + out->numskinframes = 1; if (cls.state != ca_dedicated) if (!(out->skinframes[0] = R_SkinFrame_LoadExternal(out->name, TEXF_MIPMAP | TEXF_ALPHA | TEXF_PRECACHE | TEXF_PICMIP))) Con_DPrintf("%s: could not load texture for missing shader \"%s\"\n", loadmodel->name, out->name); } // init the animation variables out->currentframe = out; + if (out->numskinframes < 1) + out->numskinframes = 1; if (!out->skinframes[0]) out->skinframes[0] = R_SkinFrame_LoadMissing(); out->currentskinframe = out->skinframes[0];