blender
/
blender
129
398
Fork 572
Code Issues 6.2k Pull Requests 747 Projects 19 Wiki Activity

Cycles: Fix misleading remaining time report when using infinite number of samples in viewport

This commit is contained in:
Sergey Sharybin 2016-04-06 16:30:52 +02:00
parent d6ae94b988
commit a51e9ece53
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
intern/cycles/blender/blender_session.cpp
View File

@ -936,7 +936,7 @@ void BlenderSession::get_progress(float& progress, double& total_time, double& r
if(background && samples_per_tile && tile_total)
progress = ((float)sample / (float)(tile_total * samples_per_tile));
else if(!background && samples > 0 && total_samples != USHRT_MAX)
else if(!background && samples > 0 && total_samples != INT_MAX)
progress = ((float)samples) / total_samples;
else
progress = 0.0;

2
intern/cycles/render/session.h
View File

@ -72,7 +72,7 @@ public:
progressive = false;
experimental = false;
samples = USHRT_MAX;
samples = INT_MAX;
tile_size = make_int2(64, 64);
start_resolution = INT_MAX;
threads = 0;