diff options
Diffstat (limited to 'intern/cycles/session/session.cpp')
-rw-r--r-- | intern/cycles/session/session.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/intern/cycles/session/session.cpp b/intern/cycles/session/session.cpp index af5c6b3f1fd..4d8e3dfbfad 100644 --- a/intern/cycles/session/session.cpp +++ b/intern/cycles/session/session.cpp @@ -303,7 +303,7 @@ RenderWork Session::run_update_for_next_iteration() tile_params.update_offset_stride(); - path_trace_->reset(buffer_params_, tile_params); + path_trace_->reset(buffer_params_, tile_params, did_reset); } const int resolution = render_work.resolution_divider; @@ -384,7 +384,8 @@ int2 Session::get_effective_tile_size() const const int tile_size = tile_manager_.compute_render_tile_size(params.tile_size); const int64_t actual_tile_area = static_cast<int64_t>(tile_size) * tile_size; - if (actual_tile_area >= image_area) { + if (actual_tile_area >= image_area && image_width <= TileManager::MAX_TILE_SIZE && + image_height <= TileManager::MAX_TILE_SIZE) { return make_int2(image_width, image_height); } |