From 0d3493d6d9827d08212b34cfc12cacfb75d167b1 Mon Sep 17 00:00:00 2001 From: Jeroen Bakker Date: Wed, 31 Jul 2019 14:32:37 +0200 Subject: [PATCH] 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 --- intern/cycles/render/session.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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);