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/kernel_film.h | |
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/kernel_film.h')
-rw-r--r-- | intern/cycles/kernel/kernel_film.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/intern/cycles/kernel/kernel_film.h b/intern/cycles/kernel/kernel_film.h index f9e9b413898..94815601179 100644 --- a/intern/cycles/kernel/kernel_film.h +++ b/intern/cycles/kernel/kernel_film.h @@ -22,9 +22,9 @@ ccl_device float4 film_map(KernelGlobals *kg, float4 irradiance, float scale) float4 result = irradiance*scale; /* conversion to srgb */ - result.x = color_scene_linear_to_srgb(result.x*exposure); - result.y = color_scene_linear_to_srgb(result.y*exposure); - result.z = color_scene_linear_to_srgb(result.z*exposure); + result.x = color_linear_to_srgb(result.x*exposure); + result.y = color_linear_to_srgb(result.y*exposure); + result.z = color_linear_to_srgb(result.z*exposure); /* clamp since alpha might be > 1.0 due to russian roulette */ result.w = saturate(result.w); |