diff options
| author | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2019-06-18 13:47:16 +0300 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2019-06-18 14:59:55 +0300 |
| commit | 00b10f9c3f24afdd3307631209906ff79298f508 (patch) | |
| tree | d7de776746114edcef38f4c2cfd0c5ce6df12c9f /source/blender/editors | |
| parent | 96f0d22e3b8a2c50cdb96e82146489f26628c127 (diff) | |
Fix T63359: no render preview when save buffers is on
Diffstat (limited to 'source/blender/editors')
| -rw-r--r-- | source/blender/editors/render/render_internal.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/source/blender/editors/render/render_internal.c b/source/blender/editors/render/render_internal.c index 8f84d84f01d..352593a15ad 100644 --- a/source/blender/editors/render/render_internal.c +++ b/source/blender/editors/render/render_internal.c @@ -137,10 +137,7 @@ static void image_buffer_rect_update(RenderJob *rj, ColorManagedViewSettings *view_settings; ColorManagedDisplaySettings *display_settings; - /* Exception for exr tiles -- display buffer conversion happens here, - * NOT in the color management pipeline. - */ - if (ibuf->userflags & IB_DISPLAY_BUFFER_INVALID && rr->do_exr_tile == false) { + if (ibuf->userflags & IB_DISPLAY_BUFFER_INVALID) { /* The whole image buffer it so be color managed again anyway. */ return; } @@ -631,7 +628,7 @@ static void image_rect_update(void *rjv, RenderResult *rr, volatile rcti *renrec * this case GLSL doesn't have original float buffer to * operate with. */ - if (rr->do_exr_tile || !rj->supports_glsl_draw || ibuf->channels == 1 || + if (!rj->supports_glsl_draw || ibuf->channels == 1 || ED_draw_imbuf_method(ibuf) != IMAGE_DRAW_METHOD_GLSL) { image_buffer_rect_update(rj, rr, ibuf, &rj->iuser, renrect, viewname); } |