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

Cycles: Fix compilation error happened after recent render time commit

This commit is contained in:
Sergey Sharybin 2015-01-15 21:27:23 +05:00
parent b8dd68cfc4
commit 197dcfdc19
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
intern/cycles/app/cycles_standalone.cpp
View File

@ -71,12 +71,12 @@ static void session_print(const string& str)
static void session_print_status()
{
int sample, tile;
double total_time, sample_time;
double total_time, sample_time, render_time;
string status, substatus;
/* get status */
sample = options.session->progress.get_sample();
options.session->progress.get_tile(tile, total_time, sample_time);
options.session->progress.get_tile(tile, total_time, sample_time, render_time);
options.session->progress.get_status(status, substatus);
if(substatus != "")
@ -166,11 +166,11 @@ static void display_info(Progress& progress)
last = elapsed;
int sample, tile;
double total_time, sample_time;
double total_time, sample_time, render_time;
string status, substatus;
sample = progress.get_sample();
progress.get_tile(tile, total_time, sample_time);
progress.get_tile(tile, total_time, sample_time, render_time);
progress.get_status(status, substatus);
if(substatus != "")