diff options
| author | Stefan Werner <stefan.werner@tangent-animation.com> | 2018-11-07 22:44:40 +0300 |
|---|---|---|
| committer | Stefan Werner <stefan.werner@tangent-animation.com> | 2018-11-07 22:44:40 +0300 |
| commit | 85a97449051a85538d1d8cb10c7efb83a50edf77 (patch) | |
| tree | 33bf0f6ee600f732342e9552366ae7fbba48fdc9 /intern | |
| parent | 6be69a6b75f6e947a5f238c4c08c5b061117dd4b (diff) | |
| parent | ee6cc1d558babde4bfd2fe1d2876136d69029bac (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'intern')
| -rw-r--r-- | intern/cycles/kernel/kernel_types.h | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/intern/cycles/kernel/kernel_types.h b/intern/cycles/kernel/kernel_types.h index a30169cc231..7bc9855a807 100644 --- a/intern/cycles/kernel/kernel_types.h +++ b/intern/cycles/kernel/kernel_types.h @@ -17,6 +17,12 @@ #ifndef __KERNEL_TYPES_H__ #define __KERNEL_TYPES_H__ +#if !defined(__KERNEL_GPU__) && defined(WITH_EMBREE) +# include <embree3/rtcore.h> +# include <embree3/rtcore_scene.h> +# define __EMBREE__ +#endif + #include "kernel/kernel_math.h" #include "kernel/svm/svm_types.h" #include "util/util_static_assert.h" @@ -25,11 +31,6 @@ # define __KERNEL_CPU__ #endif -#if defined(__KERNEL_CPU__) && defined(WITH_EMBREE) -#include <embree3/rtcore.h> -#include <embree3/rtcore_scene.h> -#endif - /* TODO(sergey): This is only to make it possible to include this header * from outside of the kernel. but this could be done somewhat cleaner? */ @@ -102,9 +103,6 @@ CCL_NAMESPACE_BEGIN # define __SHADOW_RECORD_ALL__ # define __VOLUME_DECOUPLED__ # define __VOLUME_RECORD_ALL__ -# ifdef WITH_EMBREE -# define __EMBREE__ -# endif #endif /* __KERNEL_CPU__ */ #ifdef __KERNEL_CUDA__ |