diff options
| author | Sergey Sharybin <sergey.vfx@gmail.com> | 2016-08-05 11:48:38 +0300 |
|---|---|---|
| committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2016-08-05 12:56:20 +0300 |
| commit | 470cc989459bc7723e7cd9a4358ae35c093dd54b (patch) | |
| tree | 058dfe17b87b883def6a77f32af5863c4f943e57 /intern/cycles/kernel/kernel_subsurface.h | |
| parent | a8b3ff9e16575114d35a709aa78066523bb69df3 (diff) | |
Cycles: Fix/workaround for wrong/noise render results with GCC6
Diffstat (limited to 'intern/cycles/kernel/kernel_subsurface.h')
| -rw-r--r-- | intern/cycles/kernel/kernel_subsurface.h | 15 |
1 files changed, 5 insertions, 10 deletions
diff --git a/intern/cycles/kernel/kernel_subsurface.h b/intern/cycles/kernel/kernel_subsurface.h index 4477a9f567a..5e2754b440b 100644 --- a/intern/cycles/kernel/kernel_subsurface.h +++ b/intern/cycles/kernel/kernel_subsurface.h @@ -85,16 +85,11 @@ ccl_device ShaderClosure *subsurface_scatter_pick_closure(KernelGlobals *kg, Sha return NULL; } -#ifndef __KERNEL_GPU__ -ccl_device -#else -ccl_device_inline -#endif -float3 subsurface_scatter_eval(ShaderData *sd, - ShaderClosure *sc, - float disk_r, - float r, - bool all) +ccl_device_noinline 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 |