diff options
author | Brecht Van Lommel <brecht@blender.org> | 2020-03-07 01:13:03 +0300 |
---|---|---|
committer | Brecht Van Lommel <brecht@blender.org> | 2020-03-07 01:46:58 +0300 |
commit | dcdcc234884205a8f51eb3a56d0482078105e431 (patch) | |
tree | eb73535ddb5c168a812a8c8ef8140d46620ef05e /intern/cycles/device | |
parent | b31b44c223ec4c1ca90e06a003a932aec811790a (diff) |
Fix T74504: Cycles wrong progress bar with CPU adaptive sampling
Diffstat (limited to 'intern/cycles/device')
-rw-r--r-- | intern/cycles/device/device_cpu.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/intern/cycles/device/device_cpu.cpp b/intern/cycles/device/device_cpu.cpp index 16e9f2d4340..d11918ccbbf 100644 --- a/intern/cycles/device/device_cpu.cpp +++ b/intern/cycles/device/device_cpu.cpp @@ -907,15 +907,17 @@ class CPUDevice : public Device { } tile.sample = sample + 1; - task.update_progress(&tile, tile.w * tile.h); - if (task.adaptive_sampling.use && task.adaptive_sampling.need_filter(sample)) { const bool stop = adaptive_sampling_filter(kg, tile); if (stop) { + const int num_progress_samples = end_sample - sample; tile.sample = end_sample; + task.update_progress(&tile, tile.w * tile.h * num_progress_samples); break; } } + + task.update_progress(&tile, tile.w * tile.h); } if (use_coverage) { coverage.finalize(); |