diff options
author | Jeroen Bakker <j.bakker@atmind.nl> | 2019-07-31 15:32:37 +0300 |
---|---|---|
committer | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2019-07-31 15:32:41 +0300 |
commit | 0d3493d6d9827d08212b34cfc12cacfb75d167b1 (patch) | |
tree | 6134dfa519fb5ea3e8538f0c3c993fcfa6d40c73 /intern/cycles | |
parent | 604fdb6e859d322a3a2a89cd065d253620421428 (diff) |
Fix: Cycles reporting incorrect number of samples in viewport render
During viewport rendering where the viewport samples are set to 0 the UI
showed 16777216 as number of samples. We should not show the number of
samples when the number of viewport samples are set to 0.
Differential Revision: https://developer.blender.org/D5301
Diffstat (limited to 'intern/cycles')
-rw-r--r-- | intern/cycles/render/session.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/intern/cycles/render/session.cpp b/intern/cycles/render/session.cpp index da2be0b147b..157bb6d63d3 100644 --- a/intern/cycles/render/session.cpp +++ b/intern/cycles/render/session.cpp @@ -985,7 +985,7 @@ void Session::update_status_time(bool show_pause, bool show_done) substatus += string_printf(", Prefiltered %d tiles", progress.get_denoised_tiles()); } } - else if (tile_manager.num_samples == INT_MAX) + else if (tile_manager.num_samples == Integrator::MAX_SAMPLES) substatus = string_printf("Path Tracing Sample %d", progressive_sample + 1); else substatus = string_printf("Path Tracing Sample %d/%d", progressive_sample + 1, num_samples); |