Cr8-xyz/blender
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Fix T52046: View transform applied twice w/ GL render

Browse Source 
Patch from @sergey w/ minor edit.
This commit is contained in:
Campbell Barton
2017-09-08 03:52:31 +10:00
parent a133b74709
commit df58d6bf76
1 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
source/blender/draw/intern/draw_manager.c
View File

@@ -2388,8 +2388,12 @@ void DRW_transform_to_display(GPUTexture *tex)
{ {
Scene *scene = DST.draw_ctx.scene; 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( 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) { if (!use_ocio) {