diff options
| author | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2012-09-17 14:55:18 +0400 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2012-09-17 14:55:18 +0400 |
| commit | 89eeae955b1c3904c0c511e93d63f3f1677773fb (patch) | |
| tree | 49bbad1820d846f8d63737857b4e4f3108da6537 /intern/cycles/render/session.cpp | |
| parent | bd4de709fd74d4d134795b7c9b35e37d9ed2e2bb (diff) | |
Cycles: change preview "resolution divider" that gave the number of lower
resolutions to render, to a "start resolution" which gives the resolution
to start at.
This avoids unnecessary rendering of small resolutions in small viewports,
and avoids long waiting on big viewports.
Diffstat (limited to 'intern/cycles/render/session.cpp')
| -rw-r--r-- | intern/cycles/render/session.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/intern/cycles/render/session.cpp b/intern/cycles/render/session.cpp index 05c57ba48ec..b190cdfec96 100644 --- a/intern/cycles/render/session.cpp +++ b/intern/cycles/render/session.cpp @@ -36,7 +36,7 @@ CCL_NAMESPACE_BEGIN Session::Session(const SessionParams& params_) : params(params_), - tile_manager(params.progressive, params.samples, params.tile_size, params.resolution, + tile_manager(params.progressive, params.samples, params.tile_size, params.start_resolution, (params.background)? 1: max(params.device.multi_devices.size(), 1)) { device_use_gl = ((params.device.type != DEVICE_CPU) && !params.background); @@ -343,7 +343,7 @@ bool Session::acquire_tile(Device *tile_device, RenderTile& rtile) rtile.h = tile.h; rtile.start_sample = tile_manager.state.sample; rtile.num_samples = tile_manager.state.num_samples; - rtile.resolution = tile_manager.state.resolution; + rtile.resolution = tile_manager.state.resolution_divider; tile_lock.unlock(); @@ -668,7 +668,7 @@ void Session::update_scene() void Session::update_status_time(bool show_pause, bool show_done) { int sample = tile_manager.state.sample; - int resolution = tile_manager.state.resolution; + int resolution = tile_manager.state.resolution_divider; int num_tiles = tile_manager.state.num_tiles; int tile = tile_manager.state.num_rendered_tiles; @@ -757,7 +757,7 @@ void Session::tonemap() task.rgba = display->rgba.device_pointer; task.buffer = buffers->buffer.device_pointer; task.sample = tile_manager.state.sample; - task.resolution = tile_manager.state.resolution; + task.resolution = tile_manager.state.resolution_divider; tile_manager.state.buffer.get_offset_stride(task.offset, task.stride); if(task.w > 0 && task.h > 0) { |