From 620d0574b0890b31919e473824aedb8e08d10158 Mon Sep 17 00:00:00 2001 From: havoc Date: Sun, 17 Apr 2005 09:05:32 +0000 Subject: [PATCH] texture images now take on the TEXF_FORCENEAREST and TEXF_FORCELINEAR flags from the textures placed in them (as was intended), so gl_texturemode changes should no longer affect them git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@5190 d7cf8633-e32d-0410-b094-e92efae38249 --- gl_textures.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gl_textures.c b/gl_textures.c index d79c17a5..982ea4d3 100644 --- a/gl_textures.c +++ b/gl_textures.c @@ -887,7 +887,7 @@ static void R_FindImageForTexture(gltexture_t *glt) continue; if (image->texturetype != glt->texturetype) continue; - if ((image->flags ^ glt->flags) & (TEXF_MIPMAP | TEXF_ALPHA | TEXF_CLAMP)) + if ((image->flags ^ glt->flags) & (TEXF_MIPMAP | TEXF_ALPHA | TEXF_CLAMP | TEXF_FORCENEAREST | TEXF_FORCELINEAR)) continue; if (image->glformat != texinfo->glformat || image->glinternalformat != texinfo->glinternalformat) continue; @@ -976,7 +976,7 @@ static void R_FindImageForTexture(gltexture_t *glt) image->texturetype = glt->texturetype; image->glinternalformat = texinfo->glinternalformat; image->glformat = texinfo->glformat; - image->flags = (glt->flags & (TEXF_MIPMAP | TEXF_ALPHA | TEXF_CLAMP | TEXF_PICMIP)) | GLTEXF_UPLOAD; + image->flags = (glt->flags & (TEXF_MIPMAP | TEXF_ALPHA | TEXF_CLAMP | TEXF_PICMIP | TEXF_FORCENEAREST | TEXF_FORCELINEAR)) | GLTEXF_UPLOAD; image->bytesperpixel = texinfo->internalbytesperpixel; image->sides = image->texturetype == GLTEXTURETYPE_CUBEMAP ? 6 : 1; // get a texture number to use -- 2.39.2