diff options
| author | Sergey Sharybin <sergey.vfx@gmail.com> | 2016-08-03 16:27:48 +0300 |
|---|---|---|
| committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2016-08-03 16:27:48 +0300 |
| commit | 99b1c1018ac2862c435bcb8649bad161325d1439 (patch) | |
| tree | 028bd6f07492ccfef7bffc13c0b329b050955250 /intern/cycles/kernel/kernel_path.h | |
| parent | 285e082a772f99fc09e52bcc8e8dd95f66431a60 (diff) | |
Cycles: Recent SSS inline changes broke CPU tests
Very weird, but let's just fall back a bit for now.
Diffstat (limited to 'intern/cycles/kernel/kernel_path.h')
| -rw-r--r-- | intern/cycles/kernel/kernel_path.h | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/intern/cycles/kernel/kernel_path.h b/intern/cycles/kernel/kernel_path.h index 1f08f3459e6..903be4f09a0 100644 --- a/intern/cycles/kernel/kernel_path.h +++ b/intern/cycles/kernel/kernel_path.h @@ -435,8 +435,12 @@ ccl_device_noinline void kernel_path_ao(KernelGlobals *kg, } #ifdef __SUBSURFACE__ - -ccl_device_inline bool kernel_path_subsurface_scatter( +# ifndef __KERNEL_CUDA__ +ccl_device +# else +ccl_device_inline +# endif +bool kernel_path_subsurface_scatter( KernelGlobals *kg, ShaderData *sd, ShaderData *emission_sd, |