Merge commit 'aa4bc3893f6c0c360c91896eba46631e53b2f0d1' into master-merge

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

diff --git a/tools/quake3/q3map2/surface.c b/tools/quake3/q3map2/surface.c
index 12063360c32f8272fc00782d9e35a193f4c4c48a..569fbf0811aaecbb71d5263002f49ba9a9b8e715 100644 (file)
--- a/tools/quake3/q3map2/surface.c
+++ b/tools/quake3/q3map2/surface.c
@@ -961,8 +961,7 @@ mapDrawSurface_t *DrawSurfaceForSide( entity_t *e, brush_t *b, side_t *s, windin
        ds->sampleSize = b->lightmapSampleSize;
        ds->lightmapScale = b->lightmapScale;
        ds->numVerts = w->numpoints;
-       ds->verts = safe_malloc( ds->numVerts * sizeof( *ds->verts ) );
-       memset( ds->verts, 0, ds->numVerts * sizeof( *ds->verts ) );
+       ds->verts = safe_malloc0( ds->numVerts * sizeof( *ds->verts ) );
 
        /* compute s/t coordinates from brush primitive texture matrix (compute axis base) */
        ComputeAxisBase( mapplanes[ s->planenum ].normal, texX, texY );
@@ -3034,8 +3033,7 @@ static void MakeDebugPortalSurfs_r( node_t *node, shaderInfo_t *si ){
                        VectorCopy( p->plane.normal, ds->lightmapVecs[ 2 ] );
                        ds->fogNum = -1;
                        ds->numVerts = w->numpoints;
-                       ds->verts = safe_malloc( ds->numVerts * sizeof( *ds->verts ) );
-                       memset( ds->verts, 0, ds->numVerts * sizeof( *ds->verts ) );
+                       ds->verts = safe_malloc0( ds->numVerts * sizeof( *ds->verts ) );
 
                        /* walk the winding */
                        for ( i = 0; i < ds->numVerts; i++ )
@@ -3126,11 +3124,9 @@ void MakeFogHullSurfs( entity_t *e, tree_t *tree, char *shader ){
        ds->shaderInfo = si;
        ds->fogNum = -1;
        ds->numVerts = 8;
-       ds->verts = safe_malloc( ds->numVerts * sizeof( *ds->verts ) );
-       memset( ds->verts, 0, ds->numVerts * sizeof( *ds->verts ) );
+       ds->verts = safe_malloc0( ds->numVerts * sizeof( *ds->verts ) );
        ds->numIndexes = 36;
-       ds->indexes = safe_malloc( ds->numIndexes * sizeof( *ds->indexes ) );
-       memset( ds->indexes, 0, ds->numIndexes * sizeof( *ds->indexes ) );
+       ds->indexes = safe_malloc0( ds->numIndexes * sizeof( *ds->indexes ) );
 
        /* set verts */
        VectorSet( ds->verts[ 0 ].xyz, fogMins[ 0 ], fogMins[ 1 ], fogMins[ 2 ] );