[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [54687] trunk/blender/intern/cycles/render /light.cpp: Fix shadow pass issue with non-progressive render shadow pass with emitting

[Brecht Van Lommel]

Revision: 54687
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=54687
Author:   blendix
Date:     2013-02-20 12:10:05 +0000 (Wed, 20 Feb 2013)
Log Message:
-----------
Fix shadow pass issue with non-progressive render shadow pass with emitting
meshes and world MIS.

Modified Paths:
--------------
    trunk/blender/intern/cycles/render/light.cpp

Modified: trunk/blender/intern/cycles/render/light.cpp
===================================================================
--- trunk/blender/intern/cycles/render/light.cpp	2013-02-20 12:07:27 UTC (rev 54686)
+++ trunk/blender/intern/cycles/render/light.cpp	2013-02-20 12:10:05 UTC (rev 54687)
@@ -360,11 +360,11 @@
 
 		/* bit of an ugly hack to compensate for emitting triangles influencing
 		 * amount of samples we get for this pass */
-		if(scene->integrator->progressive && kintegrator->pdf_triangles != 0.0f)
-			kfilm->pass_shadow_scale = 0.5f;
-		else
-			kfilm->pass_shadow_scale = 1.0f;
+		kfilm->pass_shadow_scale = 1.0f;
 
+		if(kintegrator->pdf_triangles != 0.0f)
+			kfilm->pass_shadow_scale *= 0.5f;
+
 		if(num_background_lights < num_lights)
 			kfilm->pass_shadow_scale *= (float)(num_lights - num_background_lights)/(float)num_lights;