Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSergey Sharybin <sergey.vfx@gmail.com>2016-08-05 13:16:24 +0300
committerSergey Sharybin <sergey.vfx@gmail.com>2016-08-05 13:16:24 +0300
commit61d7289023918f2012544da0a860d927dab4e80c (patch)
tree9e69fab2ac03675a6b353c8669165ef3b695d965
parent470cc989459bc7723e7cd9a4358ae35c093dd54b (diff)
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.
-rw-r--r--intern/cycles/kernel/kernel_subsurface.h15
1 files changed, 10 insertions, 5 deletions
diff --git a/intern/cycles/kernel/kernel_subsurface.h b/intern/cycles/kernel/kernel_subsurface.h
index 5e2754b440b..ba45eea6388 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