diff options
| author | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2011-05-09 13:03:08 +0400 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2011-05-09 13:03:08 +0400 |
| commit | 31f44d8142d84ad65b02f1a35a297d1e5f909cc6 (patch) | |
| tree | 66ef542e3740f19803677fdaf421c02c0fa2f01d /intern/cycles/util/util_color.h | |
| parent | d5929b452e449daaa55b7bf305abcd37847c4fef (diff) | |
Cycles: fix color difference between render / 3d view with color management disabled.
Diffstat (limited to 'intern/cycles/util/util_color.h')
| -rw-r--r-- | intern/cycles/util/util_color.h | 16 |
1 files changed, 16 insertions, 0 deletions
diff --git a/intern/cycles/util/util_color.h b/intern/cycles/util/util_color.h index fbba0fade63..60b738bfc51 100644 --- a/intern/cycles/util/util_color.h +++ b/intern/cycles/util/util_color.h @@ -40,6 +40,22 @@ __device float color_scene_linear_to_srgb(float c) return 1.055f * pow(c, 1.0f/2.4f) - 0.055f; } +__device float3 color_srgb_to_scene_linear(float3 c) +{ + return make_float3( + color_srgb_to_scene_linear(c.x), + color_srgb_to_scene_linear(c.y), + color_srgb_to_scene_linear(c.z)); +} + +__device float3 color_scene_linear_to_srgb(float3 c) +{ + return make_float3( + color_scene_linear_to_srgb(c.x), + color_scene_linear_to_srgb(c.y), + color_scene_linear_to_srgb(c.z)); +} + CCL_NAMESPACE_END #endif /* __UTIL_COLOR_H__ */ |