Merge commit '7ca7a54fe6db387a22ea979e62ecbbb30f6d6d30' into garux-merge

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

diff --git a/tools/quake3/q3map2/bspfile_abstract.c b/tools/quake3/q3map2/bspfile_abstract.c
index 420fca2e3b493c68c001e9a7f330eb7bff843162..d66915c9547372efa24cbf03b5611db5660db043 100644 (file)
--- a/tools/quake3/q3map2/bspfile_abstract.c
+++ b/tools/quake3/q3map2/bspfile_abstract.c
@@ -177,11 +177,12 @@ void SwapBSPFile( void ){
        /* shaders (don't swap the name) */
        for ( i = 0; i < numBSPShaders ; i++ )
        {
+       if ( doingBSP ){
                si = ShaderInfoForShader( bspShaders[ i ].shader );
                if ( si->remapShader && si->remapShader[ 0 ] ) {
                        strcpy( bspShaders[ i ].shader, si->remapShader );
                }
-
+       }
                bspShaders[ i ].contentFlags = LittleLong( bspShaders[ i ].contentFlags );
                bspShaders[ i ].surfaceFlags = LittleLong( bspShaders[ i ].surfaceFlags );
        }