[Bf-blender-cvs] [0190955] cycles_panorama_experiments: Cycles panorama experiment: Make tile sampling hack aware of resumable render
Sergey Sharybin
noreply at git.blender.org
Wed Apr 6 12:05:28 CEST 2016
Commit: 01909555d018c99d39d40e38e59bfdada8172b8c
Author: Sergey Sharybin
Date: Wed Apr 6 12:04:49 2016 +0200
Branches: cycles_panorama_experiments
https://developer.blender.org/rB01909555d018c99d39d40e38e59bfdada8172b8c
Cycles panorama experiment: Make tile sampling hack aware of resumable render
===================================================================
M intern/cycles/render/session.cpp
===================================================================
diff --git a/intern/cycles/render/session.cpp b/intern/cycles/render/session.cpp
index f78c28b..d10fb49 100644
--- a/intern/cycles/render/session.cpp
+++ b/intern/cycles/render/session.cpp
@@ -384,8 +384,9 @@ bool Session::acquire_tile(Device *tile_device, RenderTile& rtile)
scene->camera->panorama_type == PANORAMA_EQUIRECTANGULAR &&
params.pole_samples != 0)
{
- const int tot_samples = params.samples;
- const int min_samples = params.pole_samples;
+ const float mult = (float)rtile.num_samples / params.samples;
+ const int tot_samples = rtile.num_samples;
+ const int min_samples = (int)((float)params.pole_samples * mult);
const int full_height = tile_manager.state.buffer.full_height;
const int2 tile_size = params.tile_size;
int aligned_height = (int)ceilf((float)full_height / tile_size.y) * tile_size.y;
More information about the Bf-blender-cvs
mailing list