From 20d2ce2e5ff8f811a96d25d2868bf91ee9ab8c69 Mon Sep 17 00:00:00 2001 From: havoc Date: Mon, 5 Aug 2002 11:40:14 +0000 Subject: [PATCH] lightmaps shouldn't be procedural, because they have no generate function anyway (and are therefore not self-animating) git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@2200 d7cf8633-e32d-0410-b094-e92efae38249 --- model_brush.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/model_brush.c b/model_brush.c index c5c8336d..3ce2fe01 100644 --- a/model_brush.c +++ b/model_brush.c @@ -1092,12 +1092,12 @@ void Mod_GenerateLightmappedMesh (msurface_t *surf) if (r_miplightmaps.integer) { surf->lightmaptexturestride = (surf->extents[0]>>4)+1; - surf->lightmaptexture = R_ProceduralTexture(loadmodel->texturepool, NULL, surf->lightmaptexturestride, (surf->extents[1]>>4)+1, loadmodel->lightmaprgba ? TEXTYPE_RGBA : TEXTYPE_RGB, TEXF_MIPMAP | TEXF_PRECACHE, NULL, NULL, 0); + surf->lightmaptexture = R_LoadTexture(loadmodel->texturepool, NULL, surf->lightmaptexturestride, (surf->extents[1]>>4)+1, NULL, loadmodel->lightmaprgba ? TEXTYPE_RGBA : TEXTYPE_RGB, TEXF_MIPMAP | TEXF_PRECACHE); } else { surf->lightmaptexturestride = R_CompatibleFragmentWidth((surf->extents[0]>>4)+1, loadmodel->lightmaprgba ? TEXTYPE_RGBA : TEXTYPE_RGB, 0); - surf->lightmaptexture = R_ProceduralTexture(loadmodel->texturepool, NULL, surf->lightmaptexturestride, (surf->extents[1]>>4)+1, loadmodel->lightmaprgba ? TEXTYPE_RGBA : TEXTYPE_RGB, TEXF_FRAGMENT | TEXF_PRECACHE, NULL, NULL, 0); + surf->lightmaptexture = R_LoadTexture(loadmodel->texturepool, NULL, surf->lightmaptexturestride, (surf->extents[1]>>4)+1, NULL, loadmodel->lightmaprgba ? TEXTYPE_RGBA : TEXTYPE_RGB, TEXF_FRAGMENT | TEXF_PRECACHE); } R_FragmentLocation(surf->lightmaptexture, NULL, NULL, &xbase, &ybase, &xscale, &yscale); xscale = (xscale - xbase) * 16.0 / ((surf->extents[0] & ~15) + 16); -- 2.39.2