diff options
| author | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2013-06-25 03:24:39 +0400 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2013-06-25 03:24:39 +0400 |
| commit | c2d5afd81f9488092f061e476ee824212eba1361 (patch) | |
| tree | acc49b47dfb1e05754db71abe0ab2d83f7ae47ed /source/blender/editors/render | |
| parent | 208301d2fed0cb7d2faad6af38d57a6306ed6e6f (diff) | |
Fix OpenGL render not working correct with display color space set to None
(color management off).
Diffstat (limited to 'source/blender/editors/render')
| -rw-r--r-- | source/blender/editors/render/render_opengl.c | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/source/blender/editors/render/render_opengl.c b/source/blender/editors/render/render_opengl.c index b3216849dba..a22f776d9a0 100644 --- a/source/blender/editors/render/render_opengl.c +++ b/source/blender/editors/render/render_opengl.c @@ -269,10 +269,17 @@ static void screen_opengl_render_apply(OGLRender *oglrender) */ if (rect) { + int profile_to; + + if(BKE_scene_check_color_management_enabled(scene)) + profile_to = IB_PROFILE_LINEAR_RGB; + else + profile_to = IB_PROFILE_SRGB; + /* sequencer has got trickier conversion happened above * also assume opengl's space matches byte buffer color space */ IMB_buffer_float_from_byte(rr->rectf, rect, - IB_PROFILE_LINEAR_RGB, IB_PROFILE_SRGB, true, + profile_to, IB_PROFILE_SRGB, true, oglrender->sizex, oglrender->sizey, oglrender->sizex, oglrender->sizex); } |