[Bf-blender-cvs] [61d7289] master: Cycles: Correction to previous commit

[Sergey Sharybin]

Commit: 61d7289023918f2012544da0a860d927dab4e80c
Author: Sergey Sharybin
Date:   Fri Aug 5 12:16:24 2016 +0200
Branches: master
https://developer.blender.org/rB61d7289023918f2012544da0a860d927dab4e80c

Cycles: Correction to previous commit

The change didn't fix difference render result on CUDA as i've hoped,
so reverting change for GPU rendering for now.

Sorry for the noise.

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

M	intern/cycles/kernel/kernel_subsurface.h

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

diff --git a/intern/cycles/kernel/kernel_subsurface.h b/intern/cycles/kernel/kernel_subsurface.h
index 5e2754b..ba45eea 100644
--- a/intern/cycles/kernel/kernel_subsurface.h
+++ b/intern/cycles/kernel/kernel_subsurface.h
@@ -85,11 +85,16 @@ ccl_device ShaderClosure *subsurface_scatter_pick_closure(KernelGlobals *kg, Sha
 	return NULL;
 }
 
-ccl_device_noinline float3 subsurface_scatter_eval(ShaderData *sd,
-                                                   ShaderClosure *sc,
-                                                   float disk_r,
-                                                   float r,
-                                                   bool all)
+#ifndef __KERNEL_GPU__
+ccl_device_noinline
+#else
+ccl_device_inline
+#endif
+float3 subsurface_scatter_eval(ShaderData *sd,
+                               ShaderClosure *sc,
+                               float disk_r,
+                               float r,
+                               bool all)
 {
 #ifdef BSSRDF_MULTI_EVAL
 	/* this is the veach one-sample model with balance heuristic, some pdf