From: TimePath <andrew.hardaker1995@gmail.com>
Date: Sun, 30 Jul 2017 05:38:34 +0000 (+0000)
Subject: Merge branch 'subdiv' into 'master'
X-Git-Url: http://git.xonotic.org/?a=commitdiff_plain;h=73e3cc2bedc68cd6bd6479ca25e34b1c5d423bc9;hp=-c;p=xonotic%2Fnetradiant.git

Merge branch 'subdiv' into 'master'

[q3map2] allow to set arbitrary default light subdivision value

See merge request !67
---

73e3cc2bedc68cd6bd6479ca25e34b1c5d423bc9
diff --combined tools/quake3/q3map2/light.c
index 0bbb5e7b,102300d1..756b7731
--- a/tools/quake3/q3map2/light.c
+++ b/tools/quake3/q3map2/light.c
@@@ -2120,7 -2120,6 +2120,6 @@@ int LightMain( int argc, char **argv )
  	qboolean lightSamplesInsist = qfalse;
  	qboolean fastAllocate = qfalse;
  
- 
  	/* note it */
  	Sys_Printf( "--- Light ---\n" );
  	Sys_Printf( "--- ProcessGameSpecific ---\n" );
@@@ -2778,6 -2777,14 +2777,14 @@@
  			loMem = qtrue;
  			Sys_Printf( "Enabling low-memory (potentially slower) lighting mode\n" );
  		}
+ 		else if ( !strcmp( argv[ i ], "-lightsubdiv" ) ) {
+ 			defaultLightSubdivide = atoi( argv[ i + 1 ] );
+ 			if ( defaultLightSubdivide < 1 ) {
+ 				defaultLightSubdivide = 1;
+ 			}
+ 			i++;
+ 			Sys_Printf( "Default light subdivision set to %d\n", defaultLightSubdivide );
+ 		}
  		else if ( !strcmp( argv[ i ], "-lightanglehl" ) ) {
  			if ( ( atoi( argv[ i + 1 ] ) != 0 ) != lightAngleHL ) {
  				lightAngleHL = ( atoi( argv[ i + 1 ] ) != 0 );
@@@ -2788,7 -2795,6 +2795,7 @@@
  					Sys_Printf( "Disabling half lambert light angle attenuation\n" );
  				}
  			}
 +			i++;
  		}
  		else if ( !strcmp( argv[ i ], "-nostyle" ) || !strcmp( argv[ i ], "-nostyles" ) ) {
  			noStyles = qtrue;