[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [49581] branches/soc-2011-tomato/intern/ cycles/render/session.cpp: Tomato Cycles: fix regression since rev49535

Sergey Sharybin sergey.vfx at gmail.com
Sun Aug 5 19:38:44 CEST 2012


Revision: 49581
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=49581
Author:   nazgul
Date:     2012-08-05 17:38:44 +0000 (Sun, 05 Aug 2012)
Log Message:
-----------
Tomato Cycles: fix regression since rev49535

Wrong sample number was reporting in viewport rendering.

Revision Links:
--------------
    http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=49535

Modified Paths:
--------------
    branches/soc-2011-tomato/intern/cycles/render/session.cpp

Modified: branches/soc-2011-tomato/intern/cycles/render/session.cpp
===================================================================
--- branches/soc-2011-tomato/intern/cycles/render/session.cpp	2012-08-05 17:27:52 UTC (rev 49580)
+++ branches/soc-2011-tomato/intern/cycles/render/session.cpp	2012-08-05 17:38:44 UTC (rev 49581)
@@ -648,6 +648,7 @@
 
 void Session::update_status_time(bool show_pause, bool show_done)
 {
+	int sample = tile_manager.state.sample;
 	int resolution = tile_manager.state.resolution;
 	int num_tiles = tile_manager.state.num_tiles;
 	int tile = tile_manager.state.num_rendered_tiles;




More information about the Bf-blender-cvs mailing list