diff options
author | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2018-06-15 11:06:32 +0300 |
---|---|---|
committer | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2018-06-15 11:26:28 +0300 |
commit | 8148d549bbe8afdbf3116c2083d30ac288ac7a1b (patch) | |
tree | 97066acd9d5e54a158f13282590cf63b5ba48b89 /intern/cycles | |
parent | cbc7ee28d7fe145564ca6c398a99e0519d97010d (diff) |
Fix Cycles CUDA error after recent changes.
Diffstat (limited to 'intern/cycles')
-rw-r--r-- | intern/cycles/kernel/CMakeLists.txt | 1 | ||||
-rw-r--r-- | intern/cycles/kernel/kernel_types.h | 4 |
2 files changed, 3 insertions, 2 deletions
diff --git a/intern/cycles/kernel/CMakeLists.txt b/intern/cycles/kernel/CMakeLists.txt index 457602ae4e7..b1956bfb13a 100644 --- a/intern/cycles/kernel/CMakeLists.txt +++ b/intern/cycles/kernel/CMakeLists.txt @@ -82,6 +82,7 @@ set(SRC_HEADERS kernel_accumulate.h kernel_bake.h kernel_camera.h + kernel_color.h kernel_compat_cpu.h kernel_compat_cuda.h kernel_compat_opencl.h diff --git a/intern/cycles/kernel/kernel_types.h b/intern/cycles/kernel/kernel_types.h index 633518c7926..e8cbd330184 100644 --- a/intern/cycles/kernel/kernel_types.h +++ b/intern/cycles/kernel/kernel_types.h @@ -1272,13 +1272,13 @@ typedef struct KernelFilm { int pass_denoising_clean; int denoising_flags; + int pad1, pad2, pad3; + float3 xyz_to_r; float3 xyz_to_g; float3 xyz_to_b; float3 rgb_to_y; - int pad1, pad2, pad3; - #ifdef __KERNEL_DEBUG__ int pass_bvh_traversed_nodes; int pass_bvh_traversed_instances; |