Merge branch 'master' into blender2.8

2018-06-15 10:44:33 +02:00
parent 3a2a10e3a6 284e0ea756
commit 76bc8669a0
3 changed files with 10 additions and 7 deletions
--- 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
--- 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;