[Bf-blender-cvs] [b11f073] blender-v2.78-release: Cycles: Fix wrong SSS in combination with hair on AVX2 platform

[Sergey Sharybin]

Commit: b11f073ca04d181960ffa6b14200ecd34a9d1557
Author: Sergey Sharybin
Date:   Mon Sep 12 12:48:35 2016 +0200
Branches: blender-v2.78-release
https://developer.blender.org/rBb11f073ca04d181960ffa6b14200ecd34a9d1557

Cycles: Fix wrong SSS in combination with hair on AVX2 platform

Not sure why exactly that happened, need a closer look.

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

M	intern/cycles/kernel/kernel_subsurface.h

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

diff --git a/intern/cycles/kernel/kernel_subsurface.h b/intern/cycles/kernel/kernel_subsurface.h
index ba45eea..f03fe28 100644
--- a/intern/cycles/kernel/kernel_subsurface.h
+++ b/intern/cycles/kernel/kernel_subsurface.h
@@ -360,14 +360,15 @@ int subsurface_scatter_multi_intersect(
 	return num_eval_hits;
 }
 
-ccl_device void subsurface_scatter_multi_setup(KernelGlobals *kg,
-                                               SubsurfaceIntersection* ss_isect,
-                                               int hit,
-                                               ShaderData *sd,
-                                               PathState *state,
-                                               int state_flag,
-                                               ShaderClosure *sc,
-                                               bool all)
+ccl_device_noinline void subsurface_scatter_multi_setup(
+        KernelGlobals *kg,
+        SubsurfaceIntersection* ss_isect,
+        int hit,
+        ShaderData *sd,
+        PathState *state,
+        int state_flag,
+        ShaderClosure *sc,
+        bool all)
 {
 	/* Setup new shading point. */
 	shader_setup_from_subsurface(kg, sd, &ss_isect->hits[hit], &ss_isect->ray);