From 2895d1fb25cf577f87fe2980bfad0223b297aa09 Mon Sep 17 00:00:00 2001 From: divverent Date: Tue, 24 Jan 2012 21:47:07 +0000 Subject: [PATCH] Revert "don't compare texflags in Draw_CachePic_Flags simply because usage of pics doesn't have a way to specify the flags you want, so "anything matches" is a good strategy here" because I just noticed it was a bad idea (R_BeginPolygon vs line drawing). 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 | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/gl_draw.c b/gl_draw.c index 4cea94e9..127a0b37 100644 --- 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)) { -- 2.39.2