Merge commit '37bef590b1d2161b16b2bd33349fc8b56af60920' 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 1f2fa613838d9ed18502723fa7355a39707940b4..77765fe4ed8a63243b9c71f3895f1544c27c8848 100644 (file)
--- a/tools/quake3/q3map2/surface.c
+++ b/tools/quake3/q3map2/surface.c
@@ -82,7 +82,7 @@ void FinishSurface( mapDrawSurface_t *ds ){
 
 
        /* dummy check */
-       if ( ds->type <= SURFACE_BAD || ds->type >= NUM_SURFACE_TYPES || ds == NULL || ds->shaderInfo == NULL ) {
+       if ( ds == NULL || ds->shaderInfo == NULL || ds->type <= SURFACE_BAD || ds->type >= NUM_SURFACE_TYPES ) {
                return;
        }
 
@@ -3377,7 +3377,7 @@ int AddSurfaceModels( mapDrawSurface_t *ds ){
                        alpha /= ds->numVerts;
                        centroid.color[ 0 ][ 0 ] = 0xFF;
                        centroid.color[ 0 ][ 1 ] = 0xFF;
-                       centroid.color[ 0 ][ 2 ] = 0xFF;
+                       //centroid.color[ 0 ][ 2 ] = 0xFF;
                        centroid.color[ 0 ][ 2 ] = ( alpha > 255.0f ? 0xFF : alpha );
 
                        /* head vert is centroid */