From: divverent <divverent@d7cf8633-e32d-0410-b094-e92efae38249>
Date: Tue, 24 Jan 2012 21:47:07 +0000 (+0000)
Subject: Revert "don't compare texflags in Draw_CachePic_Flags simply because usage of pics... 
X-Git-Tag: xonotic-v0.8.0~96^2~356
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=8f25effd1bd57e8db1cede291240dd6d92906bba;p=xonotic%2Fdarkplaces.git

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
---

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))
 				{