Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSergey Sharybin <sergey@blender.org>2021-09-22 14:05:09 +0300
committerSergey Sharybin <sergey@blender.org>2021-09-22 16:07:55 +0300
commit9f6313498a0af386f08ed17c83bf33b8c2c3b5b3 (patch)
treee8a2c08e58108855533b29bcffe7bb7e3fa7e0fd /intern/cycles/integrator/path_trace.cpp
parentf7a492d460543fd42386cb0c941d247ea902f290 (diff)
Fix missing samples count pass when using tiles
Samples count pass is normalized to the overall number of samples. This means that we need to store actual value of the samples in the tile buffer file. A bit annoying to pull all those settings to BufferParams and need to find a more generic solution, but for now this is easiest and a quickest solution. Differential Revision: https://developer.blender.org/D12597
Diffstat (limited to 'intern/cycles/integrator/path_trace.cpp')
-rw-r--r--intern/cycles/integrator/path_trace.cpp5
1 files changed, 1 insertions, 4 deletions
diff --git a/intern/cycles/integrator/path_trace.cpp b/intern/cycles/integrator/path_trace.cpp
index bc43747718d..b62a06aea43 100644
--- a/intern/cycles/integrator/path_trace.cpp
+++ b/intern/cycles/integrator/path_trace.cpp
@@ -933,10 +933,7 @@ void PathTrace::process_full_buffer_from_disk(string_view filename)
int PathTrace::get_num_render_tile_samples() const
{
if (full_frame_state_.render_buffers) {
- /* If the full-frame buffer is read from disk the number of samples is not used as there is a
- * sample count pass for that in the buffer. Just avoid access to badly defined state of the
- * path state. */
- return 0;
+ return full_frame_state_.render_buffers->params.samples;
}
return render_scheduler_.get_num_rendered_samples();