Commit: 73b142529705e75790a4b9279109763014ca63e6 Author: Campbell Barton Date: Sat Jul 15 00:49:48 2017 +1000 Branches: blender2.8 https://developer.blender.org/rB73b142529705e75790a4b9279109763014ca63e6
DwM: don't use context to apply color-management Would give different results for off-screen rendering. =================================================================== M source/blender/draw/intern/draw_manager.c =================================================================== diff --git a/source/blender/draw/intern/draw_manager.c b/source/blender/draw/intern/draw_manager.c index f2dfd64b3f4..54e5ddc6c5a 100644 --- a/source/blender/draw/intern/draw_manager.c +++ b/source/blender/draw/intern/draw_manager.c @@ -2266,8 +2266,10 @@ void DRW_transform_to_display(GPUTexture *tex) bool use_ocio = false; - if (DST.draw_ctx.evil_C != NULL) { - use_ocio = IMB_colormanagement_setup_glsl_draw_from_space_ctx(DST.draw_ctx.evil_C, NULL, dither, false); + { + Scene *scene = DST.draw_ctx.scene; + use_ocio = IMB_colormanagement_setup_glsl_draw_from_space( + &scene->view_settings, &scene->display_settings, NULL, dither, false); } if (!use_ocio) { _______________________________________________ Bf-blender-cvs mailing list Bf-blender-cvs@blender.org https://lists.blender.org/mailman/listinfo/bf-blender-cvs