]> git.rm.cloudns.org Git - xonotic/darkplaces.git/commitdiff
Draw_CachePic_Flags: ignore TEXF_COMPRESS when comparing, because fallback pics remov...
authordivverent <divverent@d7cf8633-e32d-0410-b094-e92efae38249>
Thu, 19 Aug 2010 05:35:16 +0000 (05:35 +0000)
committerRudolf Polzer <divVerent@alientrap.org>
Fri, 20 Aug 2010 12:12:32 +0000 (14:12 +0200)
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10396 d7cf8633-e32d-0410-b094-e92efae38249
::stable-branch::merge=e685876f8e234d1a353bfdbc89a0b0e022fe520c

gl_draw.c

index f2c4f0192023433f73c83b56c3acdfb48128823f..2dfbed88973db6a3c3b219be20fa27f8abbcab68 100644 (file)
--- 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