fix lots of CRLFs
[xonotic/netradiant.git] / tools / quake3 / q3map2 / q3map2_fsr_newfiles / q3map2_fsr_svn158.patch
1 Index: light.c
2 ===================================================================
3 --- light.c     (revision 158)
4 +++ light.c     (working copy)
5 @@ -357,12 +365,13 @@
6                 intensity *= scale;
7                 
8                 /* ydnar: get deviance and samples */
9 +               /* VorteX: now set start value for _samples when _deviance is found */
10                 deviance = FloatForKey( e, "_deviance" );
11                 if( deviance == 0.0f )
12                         deviance = FloatForKey( e, "_deviation" );
13                 if( deviance == 0.0f )
14                         deviance = FloatForKey( e, "_jitter" );
15 -               numSamples = IntForKey( e, "_samples" );
16 +               numSamples = max(IntForKey( e, "_samples" ), deviance);
17                 if( deviance < 0.0f || numSamples < 1 )
18                 {
19                         deviance = 0.0f;