diff options
| author | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2016-02-17 03:20:46 +0300 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2016-02-17 03:38:55 +0300 |
| commit | 0ccae52394771fed6d50b7a0142a0f1d259da1d5 (patch) | |
| tree | d14ef4482482713d68c3f212ce218fed4ab17274 /intern/cycles/kernel/kernels | |
| parent | 833eb863ebe795b9b2589db8862b08202668c5a6 (diff) | |
Fix OpenCL kernel build errors after recent 3D texture changes.
Diffstat (limited to 'intern/cycles/kernel/kernels')
| -rw-r--r-- | intern/cycles/kernel/kernels/opencl/kernel.cl | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/intern/cycles/kernel/kernels/opencl/kernel.cl b/intern/cycles/kernel/kernels/opencl/kernel.cl index 77cb3125d46..5f35def6f7f 100644 --- a/intern/cycles/kernel/kernels/opencl/kernel.cl +++ b/intern/cycles/kernel/kernels/opencl/kernel.cl @@ -23,7 +23,7 @@ #include "../../kernel_film.h" -#ifdef __COMPILE_ONLY_MEGAKERNEL__ +#if defined(__COMPILE_ONLY_MEGAKERNEL__) || !defined(__NO_BAKING__) #include "../../kernel_path.h" #include "../../kernel_path_branched.h" #else /* __COMPILE_ONLY_MEGAKERNEL__ */ @@ -38,7 +38,7 @@ #include "../../kernel_accumulate.h" #include "../../kernel_camera.h" #include "../../kernel_shader.h" -#endif /* __COMPILE_ONLY_MEGAKERNEL__ */ +#endif /* defined(__COMPILE_ONLY_MEGAKERNEL__) || !defined(__NO_BAKING__) */ #include "../../kernel_bake.h" |