Merge commit '839c9693774fdb0e420391f65b8066e8bd04c591' into master-merge

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

diff --git a/tools/quake3/q3map2/brush.c b/tools/quake3/q3map2/brush.c
index db04b8805e2faf08bc61ec8993df13e5c09964d8..d48089540546de331b1ccfe57f76223445415f8f 100644 (file)
--- a/tools/quake3/q3map2/brush.c
+++ b/tools/quake3/q3map2/brush.c
@@ -94,10 +94,11 @@ brush_t *AllocBrush( int numSides ){
        size_t c;
 
        /* allocate and clear */
-       if ( numSides <= 0 ) {
+       /*if ( numSides <= 0 ) {
                Error( "AllocBrush called with numsides = %d", numSides );
        }
-       c = (size_t)&( ( (brush_t*) 0 )->sides[ numSides ] );
+       c = (size_t)&( ( (brush_t*) 0 )->sides[ numSides ] );*/
+       c = sizeof(*bb) + (numSides > 6 ? sizeof(side_t)*(numSides - 6) : 0);
        bb = safe_malloc0( c );
        if ( numthreads == 1 ) {
                numActiveBrushes++;