diff options
| author | Ray Molenkamp <github@lazydodo.com> | 2018-05-28 23:35:59 +0300 |
|---|---|---|
| committer | Ray Molenkamp <github@lazydodo.com> | 2018-05-28 23:35:59 +0300 |
| commit | 5d1a172783e65a6c4c52ad112aff64d3b63d0b6c (patch) | |
| tree | 02be093686847beb79d430a197ae09b4b1055a69 /intern/cycles/kernel/kernels/cpu/kernel_cpu_image.h | |
| parent | 66577c8732f4957e4afa5cafb18259ea589e74b6 (diff) | |
| parent | 81060ff6b26c22331d2066bb83d492bbe61e936c (diff) | |
Merge remote-tracking branch 'origin/master' into blender2.8
Diffstat (limited to 'intern/cycles/kernel/kernels/cpu/kernel_cpu_image.h')
| -rw-r--r-- | intern/cycles/kernel/kernels/cpu/kernel_cpu_image.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/intern/cycles/kernel/kernels/cpu/kernel_cpu_image.h b/intern/cycles/kernel/kernels/cpu/kernel_cpu_image.h index 56c38d8101c..7bf833eadbc 100644 --- a/intern/cycles/kernel/kernels/cpu/kernel_cpu_image.h +++ b/intern/cycles/kernel/kernels/cpu/kernel_cpu_image.h @@ -349,7 +349,7 @@ template<typename T> struct TextureInterpolator { * Only happens for AVX2 kernel and global __KERNEL_SSE__ vectorization * enabled. */ -#ifdef __GNUC__ +#if defined(__GNUC__) || defined(__clang__) static ccl_always_inline #else static ccl_never_inline |