Merge branch 'master' into master-merge

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

diff --git a/tools/quake3/q3map2/lightmaps_ydnar.c b/tools/quake3/q3map2/lightmaps_ydnar.c
index 2802ecaf4370c223b2d8c3e29ce6b8061154ca9d..ee9902460b505c2912fc182f571986a4308a44b3 100644 (file)
--- a/tools/quake3/q3map2/lightmaps_ydnar.c
+++ b/tools/quake3/q3map2/lightmaps_ydnar.c
@@ -3415,7 +3415,8 @@ void StoreSurfaceLightmaps( qboolean fastAllocate, qboolean storeForReal ){
                                        olm = &outLightmaps[ lm->outLightmapNums[ lightmapNum ] ];
 
                                        /* lightmap name */
-                                       if ( lm->outLightmapNums[ lightmapNum ] == lm->outLightmapNums[ 0 ] ) {
+                                       if ( !externalLightmapNames
+                                               && lm->outLightmapNums[ lightmapNum ] == lm->outLightmapNums[ 0 ] ) {
                                                strcpy( lightmapName, "$lightmap" );
                                        }
                                        else{