[Bf-blender-cvs] [717d85fb1ca] master: Fix missing render update when building without OCIO but having GLSL image draw method

Sergey Sharybin noreply at git.blender.org
Mon May 8 17:44:05 CEST 2017


Commit: 717d85fb1ca5491f4f3f62b81d65f7148ada8c64
Author: Sergey Sharybin
Date:   Mon May 8 17:43:32 2017 +0200
Branches: master
https://developer.blender.org/rB717d85fb1ca5491f4f3f62b81d65f7148ada8c64

Fix missing render update when building without OCIO but having GLSL image draw method

===================================================================

M	source/blender/editors/render/render_internal.c

===================================================================

diff --git a/source/blender/editors/render/render_internal.c b/source/blender/editors/render/render_internal.c
index 7c580bbd896..43b1d033d23 100644
--- a/source/blender/editors/render/render_internal.c
+++ b/source/blender/editors/render/render_internal.c
@@ -116,6 +116,7 @@ typedef struct RenderJob {
 	ScrArea *sa;
 	ColorManagedViewSettings view_settings;
 	ColorManagedDisplaySettings display_settings;
+	bool supports_glsl_draw;
 	bool interface_locked;
 } RenderJob;
 
@@ -569,6 +570,7 @@ static void image_rect_update(void *rjv, RenderResult *rr, volatile rcti *renrec
 		 * operate with.
 		 */
 		if (rr->do_exr_tile ||
+		    !rj->supports_glsl_draw ||
 		    ibuf->channels == 1 ||
 		    U.image_draw_method != IMAGE_DRAW_METHOD_GLSL)
 		{
@@ -904,6 +906,7 @@ static int screen_render_invoke(bContext *C, wmOperator *op, const wmEvent *even
 	rj->orig_layer = 0;
 	rj->last_layer = 0;
 	rj->sa = sa;
+	rj->supports_glsl_draw = IMB_colormanagement_support_glsl_draw(&scene->view_settings);
 
 	BKE_color_managed_display_settings_copy(&rj->display_settings, &scene->display_settings);
 	BKE_color_managed_view_settings_copy(&rj->view_settings, &scene->view_settings);




More information about the Bf-blender-cvs mailing list