Merge branch 'blender-v3.0-release'
This commit is contained in:
commit
f12a6ff5cb
|
@ -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)
|
||||
|
|
Loading…
Reference in New Issue