From 9829ba31b9654fd402ef6ca5cee78cc474d01225 Mon Sep 17 00:00:00 2001 From: Sergey Sharybin Date: Wed, 10 Oct 2012 05:56:49 +0000 Subject: Color Management: fixed color management-less texture rendering There was a missing check for whether color management enabled or not when converting byte textures to linear space. This commit also fixes wrong texture preview rendering, which was applying sRGB transform twice, making procedural textures bright. This will make float textures being previewed dark (in a linear space) but that's how it used to behave in pre-OCIO color management. --- source/blender/render/intern/include/render_types.h | 3 +++ 1 file changed, 3 insertions(+) (limited to 'source/blender/render/intern/include') diff --git a/source/blender/render/intern/include/render_types.h b/source/blender/render/intern/include/render_types.h index 85dbd9356f4..8474d9ff09e 100644 --- a/source/blender/render/intern/include/render_types.h +++ b/source/blender/render/intern/include/render_types.h @@ -120,6 +120,9 @@ struct Render /* state settings */ short flag, osa, ok, result_ok; + /* due to performance issues, getting initialized from color management settings once on Render initialization */ + short scene_color_manage; + /* result of rendering */ RenderResult *result; /* if render with single-layer option, other rendered layers are stored here */ -- cgit v1.2.3