blender
/
blender
128
396
Fork 568
Code Issues 6.2k Pull Requests 750 Projects 19 Wiki Activity

Cycles: Calculate correct remaining time when using a larger pixel size

This commit is contained in:
Lukas Stockner 2017-08-17 01:58:48 +02:00
parent 9b1e0f5af6
commit 5492d2cb67
Notes: blender-bot 2023-02-14 06:40:36 +01:00 
Referenced by issue #52438, node editor refresh
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
intern/cycles/render/tile.cpp
View File

@ -165,15 +165,17 @@ void TileManager::set_samples(int num_samples_)
uint64_t pixel_samples = 0;
/* While rendering in the viewport, the initial preview resolution is increased to the native resolution
* before the actual rendering begins. Therefore, additional pixel samples will be rendered. */
int divider = get_divider(params.width, params.height, start_resolution) / 2;
while(divider > 1) {
int divider = max(get_divider(params.width, params.height, start_resolution) / 2, pixel_size);
while(divider > pixel_size) {
int image_w = max(1, params.width/divider);
int image_h = max(1, params.height/divider);
pixel_samples += image_w * image_h;
divider >>= 1;
}
state.total_pixel_samples = pixel_samples + (uint64_t)get_num_effective_samples() * params.width*params.height;
int image_w = max(1, params.width/divider);
int image_h = max(1, params.height/divider);
state.total_pixel_samples = pixel_samples + (uint64_t)get_num_effective_samples() * image_w*image_h;
if(schedule_denoising) {
state.total_pixel_samples += params.width*params.height;
}