Page MenuHome
Differential D2465 Diff 8158 intern/cycles/render/session.cpp

Changeset View

Standalone View

View Options

intern/cycles/render/session.cpp

Show First 20 Lines • Show All 818 Lines • ▼ Show 20 Linesvoid Session::update_scene()
} }
} }
void Session::update_status_time(bool show_pause, bool show_done) void Session::update_status_time(bool show_pause, bool show_done)
{ {
int progressive_sample = tile_manager.state.sample; int progressive_sample = tile_manager.state.sample;
int num_samples = tile_manager.get_num_effective_samples(); int num_samples = tile_manager.get_num_effective_samples();
int tile = tile_manager.state.num_rendered_tiles; int tile = progress.get_finished_tiles();
int num_tiles = tile_manager.state.num_tiles; int num_tiles = tile_manager.state.num_tiles;
/* update status */ /* update status */
string status, substatus; string status, substatus;
if(!params.progressive) { if(!params.progressive) {
const bool is_cpu = params.device.type == DEVICE_CPU; const bool is_cpu = params.device.type == DEVICE_CPU;
const bool is_last_tile = (progress.get_finished_tiles() + 1) == num_tiles; const bool is_last_tile = (tile + 1) == num_tiles;
substatus = string_printf("Path Tracing Tile %d/%d", tile, num_tiles); 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: /* Some devices automatically support showing the sample number:
* - CUDADevice * - CUDADevice
* - OpenCLDevice when using the megakernel (the split kernel renders multiple * - OpenCLDevice when using the megakernel (the split kernel renders multiple
* samples at the same time, so the current sample isn't really defined) * samples at the same time, so the current sample isn't really defined)
▲ Show 20 Lines • Show All 133 Lines • Show Last 20 Lines