Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSergey Sharybin <sergey.vfx@gmail.com>2015-01-19 11:39:35 +0300
committerSergey Sharybin <sergey.vfx@gmail.com>2015-01-19 11:39:35 +0300
commit2f4aef9f3bc1880496d5a8f1a23992f8a03d0af5 (patch)
treef8b300b29de565f900bfacb4a3503c68ee2f2f0d /intern/cycles/util/util_progress.h
parent32ffc63d20908c6433e0e92488be3b5568f81f69 (diff)
Cycles: Avoid crash in statistics when canceling BVH build
Also add missing render_time initialization in progress.
Diffstat (limited to 'intern/cycles/util/util_progress.h')
-rw-r--r--intern/cycles/util/util_progress.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/intern/cycles/util/util_progress.h b/intern/cycles/util/util_progress.h
index 315aa753bdd..0ff48630a81 100644
--- a/intern/cycles/util/util_progress.h
+++ b/intern/cycles/util/util_progress.h
@@ -38,6 +38,7 @@ public:
sample = 0;
start_time = time_dt();
total_time = 0.0f;
+ render_time = 0.0f;
tile_time = 0.0f;
status = "Initializing";
substatus = "";