From 93895420eb114ec77ce36d568dbcfee20d02e27d Mon Sep 17 00:00:00 2001 From: Thomas Dinges Date: Fri, 11 Mar 2016 21:33:56 +0100 Subject: Cycles: Do no limit viewport samples to USHRT_MAX when value is at 0. We don't limit manually setting higher values, this was probably overlooked here. Found by @Blendify in IRC. --- intern/cycles/render/session.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'intern/cycles/render/session.cpp') diff --git a/intern/cycles/render/session.cpp b/intern/cycles/render/session.cpp index 762e49a8f0a..84a420ce9b6 100644 --- a/intern/cycles/render/session.cpp +++ b/intern/cycles/render/session.cpp @@ -870,7 +870,7 @@ void Session::update_status_time(bool show_pause, bool show_done) substatus += string_printf(", Sample %d/%d", status_sample, num_samples); } } - else if(tile_manager.num_samples == USHRT_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, tile_manager.num_samples); -- cgit v1.2.3