From: havoc <havoc@d7cf8633-e32d-0410-b094-e92efae38249>
Date: Fri, 6 Feb 2004 05:17:08 +0000 (+0000)
Subject: gl_texturemode should not affect TEXF_FORCENEAREST and TEXF_FORCELINEAR textures
X-Git-Tag: xonotic-v0.1.0preview~6118
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=eb0be06f1a5a1698ca9c46d5beaad5c3a16002be;p=xonotic%2Fdarkplaces.git

gl_texturemode should not affect TEXF_FORCENEAREST and TEXF_FORCELINEAR textures


git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@3870 d7cf8633-e32d-0410-b094-e92efae38249
---

diff --git a/gl_textures.c b/gl_textures.c
index 4c9b11ac..f3e8a1b2 100644
--- a/gl_textures.c
+++ b/gl_textures.c
@@ -365,7 +365,7 @@ static void GL_TextureMode_f (void)
 		for (image = pool->imagechain;image;image = image->imagechain)
 		{
 			// only update already uploaded images
-			if (!(image->flags & GLTEXF_UPLOAD))
+			if (!(image->flags & GLTEXF_UPLOAD) && !(image->flags & (TEXF_FORCENEAREST | TEXF_FORCELINEAR)))
 			{
 				qglGetIntegerv(gltexturetypebindingenums[image->texturetype], &oldbindtexnum);
 				qglBindTexture(gltexturetypeenums[image->texturetype], image->texnum);