[Bf-blender-cvs] [197dcfd] master: Cycles: Fix compilation error happened after recent render time commit
Sergey Sharybin
noreply at git.blender.org
Thu Jan 15 17:28:14 CET 2015
Commit: 197dcfdc19eaf71b1d750d7931b0fe21a7caecea
Author: Sergey Sharybin
Date: Thu Jan 15 21:27:23 2015 +0500
Branches: master
https://developer.blender.org/rB197dcfdc19eaf71b1d750d7931b0fe21a7caecea
Cycles: Fix compilation error happened after recent render time commit
===================================================================
M intern/cycles/app/cycles_standalone.cpp
===================================================================
diff --git a/intern/cycles/app/cycles_standalone.cpp b/intern/cycles/app/cycles_standalone.cpp
index c2daa8f..42c339f 100644
--- a/intern/cycles/app/cycles_standalone.cpp
+++ b/intern/cycles/app/cycles_standalone.cpp
@@ -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 != "")
More information about the Bf-blender-cvs
mailing list