diff options
| author | Lukas Stockner <lukas.stockner@freenet.de> | 2017-02-01 20:07:35 +0300 |
|---|---|---|
| committer | Lukas Stockner <lukas.stockner@freenet.de> | 2017-02-01 20:07:35 +0300 |
| commit | 71e1c3bc4b89a5b436f2b864ffb24150b29d74a0 (patch) | |
| tree | 717cf0848fa0f80bbb651bf04c6e04d9c7077e1a /intern/cycles/render/session.cpp | |
| parent | 671a28ae55235beabc579cf3e02439e07d661212 (diff) | |
| parent | fa19940dc63d22cc03e1411e2add8ec8647b5f28 (diff) | |
Merge remote-tracking branch 'origin/master' into soc-2016-cycles_denoising
Diffstat (limited to 'intern/cycles/render/session.cpp')
| -rw-r--r-- | intern/cycles/render/session.cpp | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/intern/cycles/render/session.cpp b/intern/cycles/render/session.cpp index 45cc860c435..dccb0e66100 100644 --- a/intern/cycles/render/session.cpp +++ b/intern/cycles/render/session.cpp @@ -496,6 +496,8 @@ void Session::release_tile(RenderTile& rtile) { thread_scoped_lock tile_lock(tile_mutex); + progress.add_finished_tile(); + bool delete_tile; if(tile_manager.return_tile(rtile.tile_index, delete_tile)) { @@ -994,11 +996,11 @@ void Session::update_status_time(bool show_pause, bool show_done) substatus = string_printf("Path Tracing Tile %d/%d", tile, num_tiles); - if(device->show_samples() || (is_cpu && is_last_tile)) - { + if(device->show_samples() || (is_cpu && is_last_tile)) { /* Some devices automatically support showing the sample number: * - CUDADevice - * - OpenCLDevice when using the megakernel (the split kernel renders multiple samples at the same time, so the current sample isn't really defined) + * - OpenCLDevice when using the megakernel (the split kernel renders multiple + * samples at the same time, so the current sample isn't really defined) * - CPUDevice when using one thread * For these devices, the current sample is always shown. * |