diff options
author | Sergey Sharybin <sergey@blender.org> | 2021-11-25 11:51:12 +0300 |
---|---|---|
committer | Sergey Sharybin <sergey@blender.org> | 2021-11-25 11:51:12 +0300 |
commit | f12a6ff5cb4d7de349a146003509a61f58824627 (patch) | |
tree | 31155c065bec0cf95d3ffc6069d06286884ae5ea /intern/cycles | |
parent | c49d2cbe92a1a18bb3f9ddc04ddc3351ffd27286 (diff) | |
parent | 40d28b40dfd0b0093263947f66fc1760abd55ad6 (diff) |
Merge branch 'blender-v3.0-release'
Diffstat (limited to 'intern/cycles')
-rw-r--r-- | intern/cycles/integrator/path_trace.cpp | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/intern/cycles/integrator/path_trace.cpp b/intern/cycles/integrator/path_trace.cpp index ec90681b78a..14aede2c635 100644 --- a/intern/cycles/integrator/path_trace.cpp +++ b/intern/cycles/integrator/path_trace.cpp @@ -482,7 +482,11 @@ void PathTrace::set_denoiser_params(const DenoiseParams ¶ms) } denoiser_ = Denoiser::create(device_, params); - denoiser_->is_cancelled_cb = [this]() { return is_cancel_requested(); }; + + /* Only take into account the "immediate" cancel to have interactive rendering responding to + * navigation as quickly as possible, but allow to run denoiser after user hit Esc button while + * doing offline rendering. */ + denoiser_->is_cancelled_cb = [this]() { return render_cancel_.is_requested; }; } void PathTrace::set_adaptive_sampling(const AdaptiveSampling &adaptive_sampling) |