From: havoc <havoc@d7cf8633-e32d-0410-b094-e92efae38249>
Date: Fri, 7 Mar 2003 09:31:46 +0000 (+0000)
Subject: now uses TEXF_FORCELINEAR on lightmaps
X-Git-Tag: xonotic-v0.1.0preview~6734
X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fdarkplaces.git;a=commitdiff_plain;h=f1a044305876d5bb71762af64b80bbde34993efc;ds=sidebyside

now uses TEXF_FORCELINEAR on lightmaps


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

diff --git a/model_brush.c b/model_brush.c
index 50b74903..766b5fcb 100644
--- a/model_brush.c
+++ b/model_brush.c
@@ -1260,12 +1260,12 @@ void Mod_GenerateWallMesh (msurface_t *surf, int vertexonly)
 		if (r_miplightmaps.integer)
 		{
 			surf->lightmaptexturestride = (surf->extents[0]>>4)+1;
-			surf->lightmaptexture = R_LoadTexture2D(loadmodel->texturepool, NULL, surf->lightmaptexturestride, (surf->extents[1]>>4)+1, NULL, loadmodel->lightmaprgba ? TEXTYPE_RGBA : TEXTYPE_RGB, TEXF_MIPMAP | TEXF_PRECACHE, NULL);
+			surf->lightmaptexture = R_LoadTexture2D(loadmodel->texturepool, NULL, surf->lightmaptexturestride, (surf->extents[1]>>4)+1, NULL, loadmodel->lightmaprgba ? TEXTYPE_RGBA : TEXTYPE_RGB, TEXF_MIPMAP | TEXF_FORCELINEAR | TEXF_PRECACHE, NULL);
 		}
 		else
 		{
 			surf->lightmaptexturestride = R_CompatibleFragmentWidth((surf->extents[0]>>4)+1, loadmodel->lightmaprgba ? TEXTYPE_RGBA : TEXTYPE_RGB, 0);
-			surf->lightmaptexture = R_LoadTexture2D(loadmodel->texturepool, NULL, surf->lightmaptexturestride, (surf->extents[1]>>4)+1, NULL, loadmodel->lightmaprgba ? TEXTYPE_RGBA : TEXTYPE_RGB, TEXF_FRAGMENT | TEXF_PRECACHE, NULL);
+			surf->lightmaptexture = R_LoadTexture2D(loadmodel->texturepool, NULL, surf->lightmaptexturestride, (surf->extents[1]>>4)+1, NULL, loadmodel->lightmaprgba ? TEXTYPE_RGBA : TEXTYPE_RGB, TEXF_FRAGMENT | TEXF_FORCELINEAR | TEXF_PRECACHE, NULL);
 		}
 		R_FragmentLocation(surf->lightmaptexture, NULL, NULL, &ubase, &vbase, &uscale, &vscale);
 		uscale = (uscale - ubase) * 16.0 / ((surf->extents[0] & ~15) + 16);