Merge branch 'NateEag-master-patch-12920' into 'master'

[xonotic/netradiant.git] / tools / quake3 / q3map2 / surface_foliage.c

diff --git a/tools/quake3/q3map2/surface_foliage.c b/tools/quake3/q3map2/surface_foliage.c
index 042c547a613eb4e22900b08810312e64b54e99d7..263e03bfe19e5cb5741428f40866bc8f1b537b7d 100644 (file)
--- a/tools/quake3/q3map2/surface_foliage.c
+++ b/tools/quake3/q3map2/surface_foliage.c
@@ -281,7 +281,7 @@ void Foliage( mapDrawSurface_t *src ){
                m4x4_scale_for_vec3( transform, scale );
 
                /* add the model to the bsp */
-               InsertModel( foliage->model, 0, 0, transform, NULL, NULL, src->entityNum, src->castShadows, src->recvShadows, 0, src->lightmapScale, 0, 0 );
+               InsertModel( foliage->model, 0, 0, transform, NULL, NULL, src->entityNum, src->castShadows, src->recvShadows, 0, src->lightmapScale, 0, 0, clipDepthGlobal );
 
                /* walk each new surface */
                for ( i = oldNumMapDrawSurfs; i < numMapDrawSurfs; i++ )
@@ -301,8 +301,7 @@ void Foliage( mapDrawSurface_t *src ){
                        ds->fogNum = src->fogNum;
 
                        /* add a drawvert for every instance */
-                       verts = safe_malloc( ( ds->numVerts + ds->numFoliageInstances ) * sizeof( *verts ) );
-                       memset( verts, 0, ( ds->numVerts + ds->numFoliageInstances ) * sizeof( *verts ) );
+                       verts = safe_malloc0( ( ds->numVerts + ds->numFoliageInstances ) * sizeof( *verts ) );
                        memcpy( verts, ds->verts, ds->numVerts * sizeof( *verts ) );
                        free( ds->verts );
                        ds->verts = verts;