diff options
| author | Sergey Sharybin <sergey.vfx@gmail.com> | 2016-08-05 15:45:54 +0300 |
|---|---|---|
| committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2016-08-05 15:45:54 +0300 |
| commit | c5eb400b7c7a5cfc16dcf2d75d20bcdceff13ef8 (patch) | |
| tree | cf50d1ee0e564533da8614d6b8a76d63293f5fec | |
| parent | 61d7289023918f2012544da0a860d927dab4e80c (diff) | |
Cycles: Fix embarrassing typo
Spotted by Mai Lavelle, thanks!
| -rw-r--r-- | intern/cycles/kernel/closure/bsdf.h | 2 | ||||
| -rw-r--r-- | intern/cycles/kernel/kernel_shader.h | 4 | ||||
| -rw-r--r-- | intern/cycles/kernel/svm/svm_attribute.h | 4 |
3 files changed, 5 insertions, 5 deletions
diff --git a/intern/cycles/kernel/closure/bsdf.h b/intern/cycles/kernel/closure/bsdf.h index 86e1a7f317f..1e7fbdb5450 100644 --- a/intern/cycles/kernel/closure/bsdf.h +++ b/intern/cycles/kernel/closure/bsdf.h @@ -144,7 +144,7 @@ ccl_device_inline int bsdf_sample(KernelGlobals *kg, return label; } -#ifndef __KERNEL_CUDS__ +#ifndef __KERNEL_CUDA__ ccl_device #else ccl_device_inline diff --git a/intern/cycles/kernel/kernel_shader.h b/intern/cycles/kernel/kernel_shader.h index 98d321c9c16..079bea30bdd 100644 --- a/intern/cycles/kernel/kernel_shader.h +++ b/intern/cycles/kernel/kernel_shader.h @@ -149,7 +149,7 @@ ccl_device_noinline void shader_setup_from_ray(KernelGlobals *kg, /* ShaderData setup from BSSRDF scatter */ #ifdef __SUBSURFACE__ -# ifndef __KERNEL_CUDS__ +# ifndef __KERNEL_CUDA__ ccl_device # else ccl_device_inline @@ -539,7 +539,7 @@ ccl_device_inline void _shader_bsdf_multi_eval_branched(KernelGlobals *kg, #endif -#ifndef __KERNEL_CUDS__ +#ifndef __KERNEL_CUDA__ ccl_device #else ccl_device_inline diff --git a/intern/cycles/kernel/svm/svm_attribute.h b/intern/cycles/kernel/svm/svm_attribute.h index bd6013e9205..0f0858baa11 100644 --- a/intern/cycles/kernel/svm/svm_attribute.h +++ b/intern/cycles/kernel/svm/svm_attribute.h @@ -87,7 +87,7 @@ ccl_device void svm_node_attr(KernelGlobals *kg, ShaderData *sd, float *stack, u } } -#ifndef __KERNEL_CUDS__ +#ifndef __KERNEL_CUDA__ ccl_device #else ccl_device_noinline @@ -128,7 +128,7 @@ void svm_node_attr_bump_dx(KernelGlobals *kg, ShaderData *sd, float *stack, uint } } -#ifndef __KERNEL_CUDS__ +#ifndef __KERNEL_CUDA__ ccl_device #else ccl_device_noinline |