Merge commit 'aa4bc3893f6c0c360c91896eba46631e53b2f0d1' into master-merge

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

diff --git a/tools/quake3/q3map2/light.c b/tools/quake3/q3map2/light.c
index f14cc43c843c4f8c8efdb30d632767832898ca82..20252c36a9d2b113efa943cf0f4d771722e38006 100644 (file)
--- a/tools/quake3/q3map2/light.c
+++ b/tools/quake3/q3map2/light.c
@@ -1780,7 +1780,7 @@ void TraceGrid( int num ){
                         */
                        ColorToBytesNonZero(color, bgp->ambient[i], gridScale * gridAmbientScale);
                } else {
-                       ColorToBytes(color, bgp->ambient[i], gridScale * gridAmbientScale);
+               ColorToBytes( color, bgp->ambient[ i ], gridScale * gridAmbientScale );
                }
                ColorToBytes( gp->directed[ i ], bgp->directed[ i ], gridScale );
        }
@@ -2045,8 +2045,8 @@ void LightWorld( const char *BSPFilePath, qboolean fastAllocate, qboolean noBoun
                UnparseEntities();
 
                if ( storeForReal ) {
-                       Sys_Printf( "Writing %s\n", BSPFilePath );
-                       WriteBSPFile( BSPFilePath );
+               Sys_Printf( "Writing %s\n", BSPFilePath );
+               WriteBSPFile( BSPFilePath );
                }
 
                /* note it */
@@ -2153,7 +2153,7 @@ int LightMain( int argc, char **argv ){
        const char  *value;
        int lightmapMergeSize = 0;
        qboolean lightSamplesInsist = qfalse;
-       qboolean fastAllocate = qfalse;
+       qboolean fastAllocate = qtrue;
        qboolean noBounceStore = qfalse;
 
        /* note it */
@@ -2747,6 +2747,11 @@ int LightMain( int argc, char **argv ){
                        Sys_Printf( "Slow lightmap allocation mode enabled (default)\n" );
                }
 
+               else if ( !strcmp( argv[ i ], "-slowallocate" ) ) {
+                       fastAllocate = qfalse;
+                       Sys_Printf( "Slow allocation mode enabled\n" );
+               }
+
                else if ( !strcmp( argv[ i ], "-fastgrid" ) ) {
                        fastgrid = qtrue;
                        Sys_Printf( "Fast grid lighting enabled\n" );