f560e2703b
git-svn-id: svn://svn.icculus.org/netradiant/trunk@237 61c419a2-8eb2-4b30-bcec-8cead039b335
20 lines
666 B
Diff
20 lines
666 B
Diff
Index: light.c
|
|
===================================================================
|
|
--- light.c (revision 158)
|
|
+++ light.c (working copy)
|
|
@@ -357,12 +365,13 @@
|
|
intensity *= scale;
|
|
|
|
/* ydnar: get deviance and samples */
|
|
+ /* VorteX: now set start value for _samples when _deviance is found */
|
|
deviance = FloatForKey( e, "_deviance" );
|
|
if( deviance == 0.0f )
|
|
deviance = FloatForKey( e, "_deviation" );
|
|
if( deviance == 0.0f )
|
|
deviance = FloatForKey( e, "_jitter" );
|
|
- numSamples = IntForKey( e, "_samples" );
|
|
+ numSamples = max(IntForKey( e, "_samples" ), deviance);
|
|
if( deviance < 0.0f || numSamples < 1 )
|
|
{
|
|
deviance = 0.0f;
|