[Bf-blender-cvs] [bc4043e] master: Fix T40456: cycles bug with branched path + sss + no sample all direct lights.

[Brecht Van Lommel]

Commit: bc4043e79781215ef4f583928cf60717039b178e
Author: Brecht Van Lommel
Date:   Wed Jun 4 17:54:10 2014 +0200
https://developer.blender.org/rBbc4043e79781215ef4f583928cf60717039b178e

Fix T40456: cycles bug with branched path + sss + no sample all direct lights.

===================================================================

M	intern/cycles/kernel/kernel_path.h

===================================================================

diff --git a/intern/cycles/kernel/kernel_path.h b/intern/cycles/kernel/kernel_path.h
index d760af1..b57e274 100644
--- a/intern/cycles/kernel/kernel_path.h
+++ b/intern/cycles/kernel/kernel_path.h
@@ -205,7 +205,7 @@ ccl_device void kernel_branched_path_integrate_direct_lighting(KernelGlobals *kg
 
 				if(!shadow_blocked(kg, state, &light_ray, &shadow)) {
 					/* accumulate */
-					path_radiance_accum_light(L, throughput, &L_light, shadow, 1.0f, state->bounce, is_lamp);
+					path_radiance_accum_light(L, throughput*num_samples_adjust, &L_light, shadow, num_samples_adjust, state->bounce, is_lamp);
 				}
 			}
 		}