From: havoc <havoc@d7cf8633-e32d-0410-b094-e92efae38249>
Date: Wed, 17 Feb 2010 18:27:58 +0000 (+0000)
Subject: deal with colbrushf == NULL cases in Mod_MakeCollisionBIH
X-Git-Tag: xonotic-v0.1.0preview~230^2~499
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=63993d928ff59adb9ceaef3f0287422dd571f852;p=xonotic%2Fdarkplaces.git

deal with colbrushf == NULL cases in Mod_MakeCollisionBIH


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

diff --git a/model_brush.c b/model_brush.c
index b2ca71d3..d8210634 100644
--- a/model_brush.c
+++ b/model_brush.c
@@ -6536,7 +6536,9 @@ void Mod_MakeCollisionBIH(dp_model_t *model, qboolean userendersurfaces)
 	}
 	else
 	{
-		bihnumleafs += model->nummodelbrushes;
+		for (brushindex = 0, brush = model->brush.data_brushes + brushindex+model->firstmodelbrush;brushindex < nummodelbrushes;brushindex++, brush++)
+			if (brush->colbrushf)
+				bihnumleafs++;
 		for (j = 0, surface = model->data_surfaces + model->firstmodelsurface;j < nummodelsurfaces;j++, surface++)
 			bihnumleafs += surface->num_collisiontriangles;
 	}
@@ -6576,6 +6578,8 @@ void Mod_MakeCollisionBIH(dp_model_t *model, qboolean userendersurfaces)
 		// add collision brushes
 		for (brushindex = 0, brush = model->brush.data_brushes + brushindex+model->firstmodelbrush;brushindex < nummodelbrushes;brushindex++, brush++)
 		{
+			if (!brush->colbrushf)
+				continue;
 			bihleafs[bihleafindex].type = BIH_LEAF;
 			bihleafs[bihleafindex].textureindex = brush->texture - model->data_textures;
 			bihleafs[bihleafindex].itemindex = brushindex+model->firstmodelbrush;