diff options
| author | Lukas Stockner <lukas.stockner@freenet.de> | 2018-06-14 18:48:19 +0300 |
|---|---|---|
| committer | Lukas Stockner <lukas.stockner@freenet.de> | 2018-06-14 23:21:37 +0300 |
| commit | 3ee606621cf53a2a4897e534e7e04d3632f419f8 (patch) | |
| tree | e8ffff99f0ceeea46aa170298853d8034a1acf1d /intern/cycles/kernel/kernels | |
| parent | 064e701472ac430c8063ab5d577b5014eecf9ad5 (diff) | |
Cycles: Query XYZ to/from Scene Linear conversion from OCIO instead of assuming sRGB
I've limited it to just the RGB<->XYZ stuff for now, correct image handling is the next step.
Reviewers: brecht, sergey
Differential Revision: https://developer.blender.org/D3478
Diffstat (limited to 'intern/cycles/kernel/kernels')
| -rw-r--r-- | intern/cycles/kernel/kernels/cpu/kernel_cpu_impl.h | 1 | ||||
| -rw-r--r-- | intern/cycles/kernel/kernels/cuda/kernel.cu | 1 | ||||
| -rw-r--r-- | intern/cycles/kernel/kernels/opencl/kernel.cl | 1 |
3 files changed, 3 insertions, 0 deletions
diff --git a/intern/cycles/kernel/kernels/cpu/kernel_cpu_impl.h b/intern/cycles/kernel/kernels/cpu/kernel_cpu_impl.h index ccca023a15f..5ec1655ab05 100644 --- a/intern/cycles/kernel/kernels/cpu/kernel_cpu_impl.h +++ b/intern/cycles/kernel/kernels/cpu/kernel_cpu_impl.h @@ -30,6 +30,7 @@ # include "kernel/split/kernel_split_data.h" # include "kernel/kernel_globals.h" +# include "kernel/kernel_color.h" # include "kernel/kernels/cpu/kernel_cpu_image.h" # include "kernel/kernel_film.h" # include "kernel/kernel_path.h" diff --git a/intern/cycles/kernel/kernels/cuda/kernel.cu b/intern/cycles/kernel/kernels/cuda/kernel.cu index 3c93e00ccf1..8a180a509e8 100644 --- a/intern/cycles/kernel/kernels/cuda/kernel.cu +++ b/intern/cycles/kernel/kernels/cuda/kernel.cu @@ -26,6 +26,7 @@ #include "kernel/kernel_math.h" #include "kernel/kernel_types.h" #include "kernel/kernel_globals.h" +#include "kernel/kernel_color.h" #include "kernel/kernels/cuda/kernel_cuda_image.h" #include "kernel/kernel_film.h" #include "kernel/kernel_path.h" diff --git a/intern/cycles/kernel/kernels/opencl/kernel.cl b/intern/cycles/kernel/kernels/opencl/kernel.cl index 9d5d784e140..63128d0aecf 100644 --- a/intern/cycles/kernel/kernels/opencl/kernel.cl +++ b/intern/cycles/kernel/kernels/opencl/kernel.cl @@ -20,6 +20,7 @@ #include "kernel/kernel_math.h" #include "kernel/kernel_types.h" #include "kernel/kernel_globals.h" +#include "kernel/kernel_color.h" #include "kernel/kernels/opencl/kernel_opencl_image.h" #include "kernel/kernel_film.h" |