]> de.git.xonotic.org Git - xonotic/darkplaces.git/commitdiff
Revert "don't compare texflags in Draw_CachePic_Flags simply because usage of pics...
authordivverent <divverent@d7cf8633-e32d-0410-b094-e92efae38249>
Tue, 24 Jan 2012 21:47:07 +0000 (21:47 +0000)
committerRudolf Polzer <divverent@alientrap.org>
Thu, 26 Jan 2012 17:49:02 +0000 (18:49 +0100)
This reverts commit b561aa07fda3f8aef74c4e4799ea81ef8c479e2a.

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@11657 d7cf8633-e32d-0410-b094-e92efae38249
::stable-branch::merge=8f25effd1bd57e8db1cede291240dd6d92906bba

gl_draw.c

index 4cea94e9741b964e917cc344ef187c8fb4c22430..127a0b377c8c30fc299255750095d971a8c78cae 100644 (file)
--- a/gl_draw.c
+++ b/gl_draw.c
@@ -343,8 +343,7 @@ cachepic_t *Draw_CachePic_Flags(const char *path, unsigned int cachepicflags)
                        // if it was created (or replaced) by Draw_NewPic, just return it
                        if(pic->flags & CACHEPICFLAG_NEWPIC)
                                return pic;
-                       // if (!((pic->texflags ^ texflags) & ~(TEXF_COMPRESS))) // ignore TEXF_COMPRESS when comparing, because fallback pics remove the flag
-                       // better don't compare texflags at all, because draw operations have no way to specify the texflags
+                       if (!((pic->texflags ^ texflags) & ~(TEXF_COMPRESS))) // ignore TEXF_COMPRESS when comparing, because fallback pics remove the flag
                        {
                                if(!(cachepicflags & CACHEPICFLAG_NOTPERSISTENT))
                                {