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:
authorBrecht Van Lommel <brechtvanlommel@pandora.be>2012-01-26 18:55:39 +0400
committerBrecht Van Lommel <brechtvanlommel@pandora.be>2012-01-26 18:55:39 +0400
commit7e86c8fcdc3037a8ced688a81210e5953ec91d8d (patch)
tree5117ae0184c69e64ef083fb1d87f99cb7cde020b /intern/cycles/util/util_progress.h
parentf8bddbd347e7ded7a14187ca96b69dfec70c20cd (diff)
Fix #29966: cycles elapsed time not resetting in viewport after changes.
Diffstat (limited to 'intern/cycles/util/util_progress.h')
-rw-r--r--intern/cycles/util/util_progress.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/intern/cycles/util/util_progress.h b/intern/cycles/util/util_progress.h
index acb00b03507..2cc2995bcfe 100644
--- a/intern/cycles/util/util_progress.h
+++ b/intern/cycles/util/util_progress.h
@@ -96,7 +96,7 @@ public:
{
thread_scoped_lock lock(progress_mutex);
- start_time = start_time;
+ start_time = start_time_;
}
void set_sample(int sample_, double sample_time_)