blender
/
blender
136
406
Fork 589
Code Issues 6.2k Pull Requests 747 Projects 19 Wiki Activity

Fix Cycles wrong adaptive sampling render when using sample offset 

Sample offset was not accounted for in the adaptive sampling code and caused
issues, like immediately applied adaptive filtering, with non-zero values.

Differential Revision: https://developer.blender.org/D13510
This commit is contained in:
Andrii 2021-12-09 20:54:38 +01:00 committed by Brecht Van Lommel
parent dbd64a5592
commit b8f41825e8
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
intern/cycles/integrator/render_scheduler.cpp
View File

@ -112,7 +112,7 @@ int RenderScheduler::get_rendered_sample() const
{
DCHECK_GT(get_num_rendered_samples(), 0);
return start_sample_ + get_num_rendered_samples() - 1;
return start_sample_ + get_num_rendered_samples() - 1 - sample_offset_;
}
int RenderScheduler::get_num_rendered_samples() const
@ -877,7 +877,8 @@ int RenderScheduler::get_num_samples_to_path_trace() const
* is to ensure that the final render is pixel-matched regardless of how many samples per second
* compute device can do. */
return adaptive_sampling_.align_samples(path_trace_start_sample, num_samples_to_render);
return adaptive_sampling_.align_samples(path_trace_start_sample - sample_offset_,
num_samples_to_render);
}
int RenderScheduler::get_num_samples_during_navigation(int resolution_divider) const