Revision: 43727
          
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=43727
Author:   blendix
Date:     2012-01-26 14:55:39 +0000 (Thu, 26 Jan 2012)
Log Message:
-----------
Fix #29966: cycles elapsed time not resetting in viewport after changes.

Modified Paths:
--------------
    trunk/blender/intern/cycles/util/util_progress.h

Modified: trunk/blender/intern/cycles/util/util_progress.h
===================================================================
--- trunk/blender/intern/cycles/util/util_progress.h    2012-01-26 14:55:25 UTC 
(rev 43726)
+++ trunk/blender/intern/cycles/util/util_progress.h    2012-01-26 14:55:39 UTC 
(rev 43727)
@@ -96,7 +96,7 @@
        {
                thread_scoped_lock lock(progress_mutex);
 
-               start_time = start_time;
+               start_time = start_time_;
        }
 
        void set_sample(int sample_, double sample_time_)

_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs

Reply via email to