[Bf-blender-cvs] [da81227] master: Cycles: Fix wrong sample all direct/indirect settings on sm_50 and higher

[Sergey Sharybin]

Commit: da81227e54e23d1f7e6c0c55c2ff939db2ee30a6
Author: Sergey Sharybin
Date:   Thu Feb 18 16:25:51 2016 +0100
Branches: master
https://developer.blender.org/rBda81227e54e23d1f7e6c0c55c2ff939db2ee30a6

Cycles: Fix wrong sample all direct/indirect settings on sm_50 and higher

Seems to be some compiler fault which leads to a wrong flag being used,
making it so wrong number of samples is used for the background.

This should in theory fix issue reported in T47213.

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

M	intern/cycles/kernel/kernel_path_surface.h

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

diff --git a/intern/cycles/kernel/kernel_path_surface.h b/intern/cycles/kernel/kernel_path_surface.h
index 6e94cc5..101e559 100644
--- a/intern/cycles/kernel/kernel_path_surface.h
+++ b/intern/cycles/kernel/kernel_path_surface.h
@@ -19,7 +19,7 @@ CCL_NAMESPACE_BEGIN
 #if defined(__BRANCHED_PATH__) || defined(__SUBSURFACE__)
 
 /* branched path tracing: connect path directly to position on one or more lights and add it to L */
-ccl_device void kernel_branched_path_surface_connect_light(KernelGlobals *kg, RNG *rng,
+ccl_device_noinline void kernel_branched_path_surface_connect_light(KernelGlobals *kg, RNG *rng,
 	ShaderData *sd, PathState *state, float3 throughput, float num_samples_adjust, PathRadiance *L, bool sample_all_lights)
 {
 #ifdef __EMISSION__