[Bf-blender-cvs] [8148d549bbe] master: Fix Cycles CUDA error after recent changes.

[Brecht Van Lommel]

Commit: 8148d549bbe8afdbf3116c2083d30ac288ac7a1b
Author: Brecht Van Lommel
Date:   Fri Jun 15 10:06:32 2018 +0200
Branches: master
https://developer.blender.org/rB8148d549bbe8afdbf3116c2083d30ac288ac7a1b

Fix Cycles CUDA error after recent changes.

===================================================================

M	intern/cycles/kernel/CMakeLists.txt
M	intern/cycles/kernel/kernel_types.h

===================================================================

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;