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 | |
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')
-rw-r--r-- | intern/cycles/blender/blender_sync.cpp | 4 | ||||
-rw-r--r-- | intern/cycles/render/session.cpp | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/intern/cycles/blender/blender_sync.cpp b/intern/cycles/blender/blender_sync.cpp index a3cccc62eb4..30985226e56 100644 --- a/intern/cycles/blender/blender_sync.cpp +++ b/intern/cycles/blender/blender_sync.cpp @@ -546,7 +546,7 @@ SessionParams BlenderSync::get_session_params(BL::RenderEngine& b_engine, else { params.samples = preview_aa_samples; if(params.samples == 0) - params.samples = USHRT_MAX; + params.samples = INT_MAX; } } else { @@ -556,7 +556,7 @@ SessionParams BlenderSync::get_session_params(BL::RenderEngine& b_engine, else { params.samples = preview_samples; if(params.samples == 0) - params.samples = USHRT_MAX; + params.samples = INT_MAX; } } 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); |