diff options
author | Thomas Dinges <blender@dingto.org> | 2013-07-19 18:00:53 +0400 |
---|---|---|
committer | Thomas Dinges <blender@dingto.org> | 2013-07-19 18:00:53 +0400 |
commit | fd1d4151f135e9f82ca41636c194045fba823a58 (patch) | |
tree | d708fbfd1ed65fee4b426faaf3b7cbf8e3034836 /intern | |
parent | 97397895b41bf47547bd9a20468196491df26a88 (diff) |
Fix for [#36216] Viewport render with CMJ sampler and unlimited passes freezes
* If Preview Samples are set to 0 (unlimited) it now assumes 65536 instead of INT_MAX.
This doesn't affect regular sampling, you can still enter fixed values of 100k or whatever.
Diffstat (limited to 'intern')
-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 72ed1b84915..e9e39e485f5 100644 --- a/intern/cycles/blender/blender_sync.cpp +++ b/intern/cycles/blender/blender_sync.cpp @@ -392,7 +392,7 @@ SessionParams BlenderSync::get_session_params(BL::RenderEngine b_engine, BL::Use else { params.samples = get_int(cscene, "preview_aa_samples"); if(params.samples == 0) - params.samples = INT_MAX; + params.samples = 65536; } } else { @@ -402,7 +402,7 @@ SessionParams BlenderSync::get_session_params(BL::RenderEngine b_engine, BL::Use else { params.samples = get_int(cscene, "preview_samples"); if(params.samples == 0) - params.samples = INT_MAX; + params.samples = 65536; } } diff --git a/intern/cycles/render/session.cpp b/intern/cycles/render/session.cpp index d13e86429d6..9ff2b91e25e 100644 --- a/intern/cycles/render/session.cpp +++ b/intern/cycles/render/session.cpp @@ -786,7 +786,7 @@ void Session::update_status_time(bool show_pause, bool show_done) substatus += string_printf(", Sample %d/%d", sample, num_samples); } } - else if(tile_manager.num_samples == INT_MAX) + else if(tile_manager.num_samples == 65536) substatus = string_printf("Path Tracing Sample %d", sample+1); else substatus = string_printf("Path Tracing Sample %d/%d", sample+1, tile_manager.num_samples); |