From: divverent Date: Tue, 24 Jan 2012 21:45:05 +0000 (+0000) Subject: don't compare texflags in Draw_CachePic_Flags simply because usage of pics doesn... X-Git-Tag: xonotic-v0.6.0~51 X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=bf27703dee54c5c34455d93f5866e67b97610fe1;p=xonotic%2Fdarkplaces.git 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 git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@11656 d7cf8633-e32d-0410-b094-e92efae38249 ::stable-branch::merge=fd9bc70e5aeb51c4b0d32f112d289841dadb2708 --- diff --git a/gl_draw.c b/gl_draw.c index 589140e2..4cea94e9 100644 --- a/gl_draw.c +++ b/gl_draw.c @@ -343,7 +343,8 @@ 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 | TEXF_MIPMAP))) // ignore TEXF_COMPRESS when comparing, because fallback pics remove the flag, and ignore TEXF_MIPMAP because QC specifies that + // 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(!(cachepicflags & CACHEPICFLAG_NOTPERSISTENT)) {