diff options
author | Lukas Stockner <lukas.stockner@freenet.de> | 2015-01-14 21:06:10 +0300 |
---|---|---|
committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2015-01-14 21:14:16 +0300 |
commit | 193871ae7da35548688d7b9ccadde66e4f35d2fd (patch) | |
tree | a3c16ab2d05f58f16042dd2b6fbb3d318f1ecfb4 /intern/cycles/blender/blender_session.h | |
parent | 0d6e88b446d667f66bd63d5cdcbdc91339575bf1 (diff) |
Cycles: Ignore preprocessing time in ETA calculation
This patch makes Cycles ignore the time spent in BVH construction etc. when
estimating the remaining time. Considering that the remaining time is calculated
based on the average time per tile so far, as far as I understand it makes no
sense to include the preprocessing time.
Reviewers: sergey, #cycles
Reviewed By: sergey, #cycles
Subscribers: sergey
Projects: #cycles
Differential Revision: https://developer.blender.org/D895
Diffstat (limited to 'intern/cycles/blender/blender_session.h')
-rw-r--r-- | intern/cycles/blender/blender_session.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/intern/cycles/blender/blender_session.h b/intern/cycles/blender/blender_session.h index 63cb15d8437..33da3076b55 100644 --- a/intern/cycles/blender/blender_session.h +++ b/intern/cycles/blender/blender_session.h @@ -70,7 +70,7 @@ public: void tag_redraw(); void tag_update(); void get_status(string& status, string& substatus); - void get_progress(float& progress, double& total_time); + void get_progress(float& progress, double& total_time, double& render_time); void test_cancel(); void update_status_progress(); void update_bake_progress(); |