Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrecht Van Lommel <brechtvanlommel@gmail.com>2019-06-24 14:34:31 +0300
committerBrecht Van Lommel <brechtvanlommel@gmail.com>2019-06-24 14:37:31 +0300
commit037956f13fc947c9f08302634a64449ec9ba590e (patch)
tree0764a79db6d844514a628b267a58d14e6c96a774 /intern/cycles/blender/blender_session.cpp
parent52b4afacb21a1627f09d6cc4450cc6a8fc56c96d (diff)
Fix T66075: memory leak in Cycles render tile updates
Diffstat (limited to 'intern/cycles/blender/blender_session.cpp')
-rw-r--r--intern/cycles/blender/blender_session.cpp8
1 files changed, 2 insertions, 6 deletions
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,