[Bf-blender-cvs] [cd197b959fc] cycles-x: Fix crash cancelling render in middle of scene update

[Brecht Van Lommel]

Commit: cd197b959fc909edb760857d8767da9dce643841
Author: Brecht Van Lommel
Date:   Wed Aug 25 17:01:00 2021 +0200
Branches: cycles-x
https://developer.blender.org/rBcd197b959fc909edb760857d8767da9dce643841

Fix crash cancelling render in middle of scene update

Particularly likely with preview renders. Detect cancel state after
scene update rather than using incomplete scene for render.

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

M	intern/cycles/render/session.cpp

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

diff --git a/intern/cycles/render/session.cpp b/intern/cycles/render/session.cpp
index 8ce5f05c361..c73a83b687a 100644
--- a/intern/cycles/render/session.cpp
+++ b/intern/cycles/render/session.cpp
@@ -160,8 +160,6 @@ bool Session::ready_to_reset()
 void Session::run_main_render_loop()
 {
   while (true) {
-    const bool did_cancel = progress.get_cancel();
-
     RenderWork render_work = run_update_for_next_iteration();
 
     if (!render_work) {
@@ -179,6 +177,7 @@ void Session::run_main_render_loop()
       }
     }
 
+    const bool did_cancel = progress.get_cancel();
     if (did_cancel) {
       render_scheduler_.render_work_reschedule_on_cancel(render_work);
       if (!render_work) {