blender
/
blender
137
416
Fork 599
Code Issues 6.3k Pull Requests 771 Projects 19 Wiki Activity

Fix T91598: Decreasing sample count causes viewport to reset 

Differential Revision: https://developer.blender.org/D12601
This commit is contained in:
Sergey Sharybin 2021-09-22 18:00:39 +02:00
parent 5033310e8a
commit 4068b6b5a7
Notes: blender-bot 2023-02-13 17:37:52 +01:00 
Referenced by issue #91598, Cycles regression: Decreasing sample count below current viewport samples causes viewport to reset
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
intern/cycles/render/session.cpp
View File

@ -261,6 +261,7 @@ RenderWork Session::run_update_for_next_iteration()
bool have_tiles = true;
bool switched_to_new_tile = false;
const bool did_reset = delayed_reset_.do_reset;
if (delayed_reset_.do_reset) {
thread_scoped_lock buffers_lock(buffers_mutex_);
do_delayed_reset();
@ -272,8 +273,12 @@ RenderWork Session::run_update_for_next_iteration()
/* Update number of samples in the integrator.
* Ideally this would need to happen once in `Session::set_samples()`, but the issue there is
* the initial configuration when Session is created where the `set_samples()` is not used. */
scene->integrator->set_aa_samples(params.samples);
* the initial configuration when Session is created where the `set_samples()` is not used.
*
* NOTE: Unless reset was requested only allow increasing number of samples. */
if (did_reset || scene->integrator->get_aa_samples() < params.samples) {
scene->integrator->set_aa_samples(params.samples);
}
/* Update denoiser settings. */
{