From 6a62eaee164fc07bb7829eaf44d1ea064a72e6ec Mon Sep 17 00:00:00 2001 From: havoc Date: Thu, 18 Feb 2010 12:11:48 +0000 Subject: [PATCH] don't error out if external lightmap sizes mismatch, just print a warning and ignore the mismatching one and any later ones git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@9986 d7cf8633-e32d-0410-b094-e92efae38249 --- model_brush.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/model_brush.c b/model_brush.c index ea5a2391..2f7caae2 100644 --- a/model_brush.c +++ b/model_brush.c @@ -4596,9 +4596,10 @@ static void Mod_Q3BSP_LoadLightmaps(lump_t *l, lump_t *faceslump) break; // we got all of them if(image_width != size || image_height != size) { - for(i = 0; i <= count; ++i) - Mem_Free(inpixels[i]); - Host_Error("Mod_Q3BSP_LoadLightmaps: invalid external lightmap size in %s",loadmodel->name); + Mem_Free(inpixels[count]); + inpixels[count] = NULL; + Con_Printf("Mod_Q3BSP_LoadLightmaps: mismatched lightmap size in %s - external lightmap %s/lm_%04d does not match earlier ones\n", loadmodel->name, mapname, count); + break; } } } -- 2.39.2