diff options
| author | Sergey Sharybin <sergey.vfx@gmail.com> | 2017-06-14 11:11:18 +0300 |
|---|---|---|
| committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2017-06-14 11:11:18 +0300 |
| commit | 07c7bbef0dfa94fc8217d54f583ccdc7ea1657ab (patch) | |
| tree | d9b02aca09894151033f84937cd8334c91092f39 /intern | |
| parent | 26efc7bbd1d15bfea9c1bd0538a27d13c9620f3b (diff) | |
| parent | bbd0d43417112e1b0d93c1004b49c989860a3b89 (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'intern')
| -rw-r--r-- | intern/cycles/kernel/kernel_types.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/intern/cycles/kernel/kernel_types.h b/intern/cycles/kernel/kernel_types.h index 31e47e837fd..34affab1b9d 100644 --- a/intern/cycles/kernel/kernel_types.h +++ b/intern/cycles/kernel/kernel_types.h @@ -135,7 +135,7 @@ CCL_NAMESPACE_BEGIN * this is because megakernel in device_opencl does not support * custom cflags depending on the scene features. */ -# endif /* __KERNEL_OPENCL_NVIDIA__ */ +# endif /* __KERNEL_OPENCL_APPLE__ */ # ifdef __KERNEL_OPENCL_AMD__ # define __CL_USE_NATIVE__ |