diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2017-09-07 20:52:31 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2017-09-07 20:57:07 +0300 |
| commit | df58d6bf76e6551e26fe64480b842f0e18b75e4b (patch) | |
| tree | 95b2eeebe182f6305caeaeb0f0a9881f267215ce /source/blender/draw/intern | |
| parent | a133b7470974b1a6e327955a1cc4249375bc2386 (diff) | |
Fix T52046: View transform applied twice w/ GL render
Patch from @sergey w/ minor edit.
Diffstat (limited to 'source/blender/draw/intern')
| -rw-r--r-- | source/blender/draw/intern/draw_manager.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/source/blender/draw/intern/draw_manager.c b/source/blender/draw/intern/draw_manager.c index 94079f3a1e6..601ea35f8c1 100644 --- a/source/blender/draw/intern/draw_manager.c +++ b/source/blender/draw/intern/draw_manager.c @@ -2388,8 +2388,12 @@ void DRW_transform_to_display(GPUTexture *tex) { Scene *scene = DST.draw_ctx.scene; + /* View transform is already applied for offscreen, don't apply again, see: T52046 */ + ColorManagedViewSettings *view_settings = + (DST.options.is_image_render && !DST.options.is_scene_render) ? + NULL : &scene->view_settings; use_ocio = IMB_colormanagement_setup_glsl_draw_from_space( - &scene->view_settings, &scene->display_settings, NULL, dither, false); + view_settings, &scene->display_settings, NULL, dither, false); } if (!use_ocio) { |