[Bf-blender-cvs] [c986b07e4dd] blender2.8: Draw Manager: Fix crash when saving file.
Clément Foucault
noreply at git.blender.org
Fri May 12 16:31:20 CEST 2017
Commit: c986b07e4dd88bdf93864c597a287334852a03e8
Author: Clément Foucault
Date: Fri May 12 16:29:16 2017 +0200
Branches: blender2.8
https://developer.blender.org/rBc986b07e4dd88bdf93864c597a287334852a03e8
Draw Manager: Fix crash when saving file.
===================================================================
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 92f72bc6664..1d98fe94961 100644
--- a/source/blender/draw/intern/draw_manager.c
+++ b/source/blender/draw/intern/draw_manager.c
@@ -1931,7 +1931,11 @@ void DRW_transform_to_display(GPUTexture *tex)
const float dither = 1.0f;
- bool use_ocio = IMB_colormanagement_setup_glsl_draw_from_space_ctx(DST.draw_ctx.evil_C, NULL, dither, false);
+ 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);
+ }
if (!use_ocio) {
immBindBuiltinProgram(GPU_SHADER_2D_IMAGE_LINEAR_TO_SRGB);
More information about the Bf-blender-cvs
mailing list