From 037956f13fc947c9f08302634a64449ec9ba590e Mon Sep 17 00:00:00 2001 From: Brecht Van Lommel Date: Mon, 24 Jun 2019 13:34:31 +0200 Subject: Fix T66075: memory leak in Cycles render tile updates --- intern/cycles/blender/blender_session.cpp | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) (limited to 'intern/cycles/blender/blender_session.cpp') diff --git a/intern/cycles/blender/blender_session.cpp b/intern/cycles/blender/blender_session.cpp index 489e1ca90eb..126b6ad25be 100644 --- a/intern/cycles/blender/blender_session.cpp +++ b/intern/cycles/blender/blender_session.cpp @@ -363,9 +363,8 @@ void BlenderSession::do_write_update_render_tile(RenderTile &rtile, if (merge) { update_render_result(b_rr, b_rlay, rtile); } - else { - end_render_result(b_engine, b_rr, true, highlight, merge); - } + + end_render_result(b_engine, b_rr, true, highlight, merge); } else { /* Write final render result. */ @@ -826,9 +825,6 @@ void BlenderSession::do_write_update_render_result(BL::RenderResult &b_rr, if (buffers->get_pass_rect(PASS_COMBINED, exposure, sample, 4, &pixels[0], "Combined")) b_combined_pass.rect(&pixels[0]); } - - /* tag result as updated */ - b_engine.update_result(b_rr); } void BlenderSession::write_render_result(BL::RenderResult &b_rr, -- cgit v1.2.3