[Bf-blender-cvs] [037956f13fc] master: Fix T66075: memory leak in Cycles render tile updates
Brecht Van Lommel
noreply at git.blender.org
Mon Jun 24 13:38:06 CEST 2019
Commit: 037956f13fc947c9f08302634a64449ec9ba590e
Author: Brecht Van Lommel
Date: Mon Jun 24 13:34:31 2019 +0200
Branches: master
https://developer.blender.org/rB037956f13fc947c9f08302634a64449ec9ba590e
Fix T66075: memory leak in Cycles render tile updates
===================================================================
M 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,
More information about the Bf-blender-cvs
mailing list