diff options
| author | Sergey Sharybin <sergey@blender.org> | 2021-09-22 18:30:00 +0300 |
|---|---|---|
| committer | Sergey Sharybin <sergey@blender.org> | 2021-09-22 18:30:00 +0300 |
| commit | ac68b08c5b785ce08637fac14c20dc3b52cfed47 (patch) | |
| tree | 4453a2874b10b5c6a6e6c3d25c6d0202dc0aab2c /intern/cycles/render/session.cpp | |
| parent | bc1e675bb905baec73f2758b009826530678e436 (diff) | |
Fix T91592: Negative Cycles remaining render time
For the default startup was showing -14:-08.-48 as a remaining time.
Was an integer overflow when specifying total number of pixel-samples.
Diffstat (limited to 'intern/cycles/render/session.cpp')
| -rw-r--r-- | intern/cycles/render/session.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/intern/cycles/render/session.cpp b/intern/cycles/render/session.cpp index 47eeffd97fe..0539e02a8d5 100644 --- a/intern/cycles/render/session.cpp +++ b/intern/cycles/render/session.cpp @@ -430,7 +430,8 @@ void Session::do_delayed_reset() /* Progress. */ progress.reset_sample(); - progress.set_total_pixel_samples(buffer_params_.width * buffer_params_.height * params.samples); + progress.set_total_pixel_samples(static_cast<uint64_t>(buffer_params_.width) * + buffer_params_.height * params.samples); if (!params.background) { progress.set_start_time(); |