diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2013-07-23 12:28:28 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2013-07-23 12:28:28 +0400 |
| commit | 28299d98fb93e87b2322d0533395254e2792a86f (patch) | |
| tree | b32d6cff39d1cc5f31bfa1201b623dd24dde04ff /intern/cycles/render/session.cpp | |
| parent | 4a999f9e96965bd4aa45ce4cdd5c225bbf901226 (diff) | |
svn merge ^/trunk/blender -c58374 -c58406 -c58422 -c58427 -c58436 -c58440 -c58441 -c58463 -c58504 -c58509 -c58512 -c58513 -c58514 -c58516 -c58520 -c58532 -c58534v2.68a
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 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); |