diff options
| author | Thomas Dinges <blender@dingto.org> | 2016-03-11 23:33:56 +0300 |
|---|---|---|
| committer | Thomas Dinges <blender@dingto.org> | 2016-03-11 23:36:07 +0300 |
| commit | 93895420eb114ec77ce36d568dbcfee20d02e27d (patch) | |
| tree | d93bb56af67d6ad6789304d3b4d23b431e2d7165 /intern/cycles/render/session.cpp | |
| parent | 1394369332904a13d912cb68e10bbae8bf068492 (diff) | |
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.
Diffstat (limited to 'intern/cycles/render/session.cpp')
| -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 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); |