From: divverent Date: Thu, 19 Aug 2010 05:35:16 +0000 (+0000) Subject: Draw_CachePic_Flags: ignore TEXF_COMPRESS when comparing, because fallback pics remov... X-Git-Tag: xonotic-v0.1.0preview~278 X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=e8750d8e6dcc19947f827b9cf72294e8299df763;p=xonotic%2Fdarkplaces.git Draw_CachePic_Flags: ignore TEXF_COMPRESS when comparing, because fallback pics remove the flag git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10396 d7cf8633-e32d-0410-b094-e92efae38249 ::stable-branch::merge=e685876f8e234d1a353bfdbc89a0b0e022fe520c --- diff --git a/gl_draw.c b/gl_draw.c index f2c4f019..2dfbed88 100644 --- a/gl_draw.c +++ b/gl_draw.c @@ -331,7 +331,7 @@ cachepic_t *Draw_CachePic_Flags(const char *path, unsigned int cachepicflags) hashkey = ((crc >> 8) ^ crc) % CACHEPICHASHSIZE; for (pic = cachepichash[hashkey];pic;pic = pic->chain) if (!strcmp (path, pic->name)) - if(pic->texflags == texflags) + if(!((pic->texflags ^ texflags) & ~(TEXF_COMPRESS))) // ignore TEXF_COMPRESS when comparing, because fallback pics remove the flag { if(!(cachepicflags & CACHEPICFLAG_NOTPERSISTENT)) pic->autoload = false; // persist it