From: havoc <havoc@d7cf8633-e32d-0410-b094-e92efae38249>
Date: Tue, 22 Dec 2009 02:06:10 +0000 (+0000)
Subject: fix a crash on non-deluxemapped q3bsp loading
X-Git-Tag: xonotic-v0.1.0preview~1013
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=200d0d435d2016b7cb04e181e447c4cb497148ba;p=xonotic%2Fdarkplaces.git

fix a crash on non-deluxemapped q3bsp loading


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

diff --git a/model_brush.c b/model_brush.c
index b703ffa9..4ab7e7d6 100644
--- a/model_brush.c
+++ b/model_brush.c
@@ -4720,7 +4720,7 @@ static void Mod_Q3BSP_LoadLightmaps(lump_t *l, lump_t *faceslump)
 
 	for (i = 0;i < loadmodel->brushq3.num_mergedlightmaps;i++)
 	{
-		if (loadmodel->brushq3.data_deluxemaps[i])
+		if (loadmodel->brushq3.data_deluxemaps && loadmodel->brushq3.data_deluxemaps[i])
 			R_FlushTexture(loadmodel->brushq3.data_deluxemaps[i]);
 		if (loadmodel->brushq3.data_lightmaps[i])
 			R_FlushTexture(loadmodel->brushq3.data_lightmaps[i]);