[Bf-blender-cvs] [0d3493d6d98] master: Fix: Cycles reporting incorrect number of samples in viewport render

[Jeroen Bakker]

Commit: 0d3493d6d9827d08212b34cfc12cacfb75d167b1
Author: Jeroen Bakker
Date:   Wed Jul 31 14:32:37 2019 +0200
Branches: master
https://developer.blender.org/rB0d3493d6d9827d08212b34cfc12cacfb75d167b1

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

===================================================================

M	intern/cycles/render/session.cpp

===================================================================

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);