From 9b48f2b27c0f64c7f8cc452ad3820f705c15495d Mon Sep 17 00:00:00 2001 From: Sergey Sharybin Date: Tue, 19 Apr 2016 12:54:29 +0200 Subject: Cycles: Improvements and fixes for the resumable render - Fix wrong current sample reported in the log - Also includes fix for progressive refine log - Explicitly print to the stdout that resumable render is enabled - Print error message and abort when passing wrong values for the resumable render. Never waste someone's compute power for wrong render! Fixes T48185: Cycles resumable num chunks breaks sample counter --- intern/cycles/render/session.cpp | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'intern/cycles/render/session.cpp') diff --git a/intern/cycles/render/session.cpp b/intern/cycles/render/session.cpp index 84a420ce9b6..24f48b61349 100644 --- a/intern/cycles/render/session.cpp +++ b/intern/cycles/render/session.cpp @@ -831,7 +831,8 @@ void Session::update_status_time(bool show_pause, bool show_done) string status, substatus; if(!params.progressive) { - const int progress_sample = progress.get_sample(), num_samples = tile_manager.num_samples; + const int progress_sample = progress.get_sample(), + num_samples = tile_manager.get_num_effective_samples(); const bool is_gpu = params.device.type == DEVICE_CUDA || params.device.type == DEVICE_OPENCL; const bool is_multidevice = params.device.multi_devices.size() > 1; const bool is_cpu = params.device.type == DEVICE_CPU; @@ -873,7 +874,9 @@ void Session::update_status_time(bool show_pause, bool show_done) 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); + substatus = string_printf("Path Tracing Sample %d/%d", + sample+1, + tile_manager.get_num_effective_samples()); if(show_pause) { status = "Paused"; -- cgit v1.2.3