[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [45401] trunk/blender/intern/cycles/render /session.cpp: Fix #30710: cycles wrong render time after pause/ unpause in viewport.

[Brecht Van Lommel]

Revision: 45401
          
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=45401
Author:   blendix
Date:     2012-04-04 16:11:44 +0000 (Wed, 04 Apr 2012)
Log Message:
-----------
Fix #30710: cycles wrong render time after pause/unpause in viewport.

Modified Paths:
--------------
    trunk/blender/intern/cycles/render/session.cpp

Modified: trunk/blender/intern/cycles/render/session.cpp
===================================================================
--- trunk/blender/intern/cycles/render/session.cpp      2012-04-04 16:11:39 UTC 
(rev 45400)
+++ trunk/blender/intern/cycles/render/session.cpp      2012-04-04 16:11:44 UTC 
(rev 45401)
@@ -164,7 +164,7 @@
        paused_time = 0.0;
 
        if(!params.background)
-               progress.set_start_time(start_time - paused_time);
+               progress.set_start_time(start_time + paused_time);
 
        while(!progress.get_cancel()) {
                /* advance to next tile */
@@ -191,7 +191,7 @@
                                        paused_time += time_dt() - pause_start;
 
                                        if(!params.background)
-                                               
progress.set_start_time(start_time - paused_time);
+                                               
progress.set_start_time(start_time + paused_time);
 
                                        update_status_time(pause, no_tiles);
                                        progress.set_update();
@@ -340,7 +340,7 @@
                                        paused_time += time_dt() - pause_start;
 
                                        if(!params.background)
-                                               
progress.set_start_time(start_time - paused_time);
+                                               
progress.set_start_time(start_time + paused_time);
 
                                        update_status_time(pause, no_tiles);
                                        progress.set_update();
@@ -473,7 +473,7 @@
        sample = 0;
 
        if(!params.background)
-               progress.set_start_time(start_time - paused_time);
+               progress.set_start_time(start_time + paused_time);
 }
 
 void Session::reset(BufferParams& buffer_params, int samples)

_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
http://lists.blender.org/mailman/listinfo/bf-blender-cvs