[Bf-blender-cvs] [126c0d1ebd4] cycles-x: Fix possible duplicated tile written on cancel in Cycles X

[Sergey Sharybin]

Commit: 126c0d1ebd4e5d568dd18971d2b1138965085550
Author: Sergey Sharybin
Date:   Tue Sep 7 11:41:39 2021 +0200
Branches: cycles-x
https://developer.blender.org/rB126c0d1ebd4e5d568dd18971d2b1138965085550

Fix possible duplicated tile written on cancel in Cycles X

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

M	intern/cycles/integrator/render_scheduler.cpp

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

diff --git a/intern/cycles/integrator/render_scheduler.cpp b/intern/cycles/integrator/render_scheduler.cpp
index d80c163ec09..1e9fb69430a 100644
--- a/intern/cycles/integrator/render_scheduler.cpp
+++ b/intern/cycles/integrator/render_scheduler.cpp
@@ -231,12 +231,14 @@ void RenderScheduler::render_work_reschedule_on_cancel(RenderWork &render_work)
 
   /* Do not write tile if it has zero samples it it, treat it similarly to all other tiles which
    * got cancelled. */
-  if (!state_.tile_result_was_written && get_num_rendered_samples() != 0) {
+  const bool has_rendered_samples = get_num_rendered_samples() != 0;
+
+  if (!state_.tile_result_was_written && has_rendered_samples) {
     render_work.tile.write = true;
     render_work.update_display = true;
   }
 
-  if (!state_.full_frame_was_written) {
+  if (!state_.full_frame_was_written && has_rendered_samples) {
     render_work.full.write = true;
     render_work.update_display = true;
   }