Fix another part of #34877: cycles progress status text not showing correct with

per render layer samples in addition to the progress bar.

Also fixed job progress bar not working at all on high DPI / retina, was so small
the actual progress was not visible.

1 files changed, 4 insertions, 4 deletions

diff --git a/intern/cycles/render/session.cpp b/intern/cycles/render/session.cpp
index 6ed14452c6b..075f5eb6bab 100644
--- a/intern/cycles/render/session.cpp
+++ b/intern/cycles/render/session.cpp
@@ -758,7 +758,7 @@ void Session::update_status_time(bool show_pause, bool show_done)
 			 * also display the info on CPU, when using 1 tile only
 			 */
 
-			int sample = progress.get_sample(), num_samples = tile_manager.state.num_samples;
+			int sample = progress.get_sample(), num_samples = tile_manager.num_samples;
 
 			if(tile > 1) {
 				/* sample counter is global for all tiles, subtract samples
@@ -771,10 +771,10 @@ void Session::update_status_time(bool show_pause, bool show_done)
 			substatus += string_printf(", Sample %d/%d", sample, num_samples);
 		}
 	}
-	else if(params.samples == INT_MAX)
+	else if(tile_manager.num_samples == INT_MAX)
 		substatus = string_printf("Path Tracing Sample %d", sample+1);
 	else
-		substatus = string_printf("Path Tracing Sample %d/%d", sample+1, params.samples);
+		substatus = string_printf("Path Tracing Sample %d/%d", sample+1, tile_manager.num_samples);
 	
 	if(show_pause)
 		status = "Paused";
@@ -846,7 +846,7 @@ void Session::tonemap()
 bool Session::update_progressive_refine(bool cancel)
 {
 	int sample = tile_manager.state.sample + 1;
-	bool write = sample == params.samples || cancel;
+	bool write = sample == tile_manager.num_samples || cancel;
 
 	double current_time = time_dt();