[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [49527] branches/soc-2011-tomato/intern/ cycles/render: Tomato Cycles: fix own regression in currently rendering tile status

[Sergey Sharybin]

Revision: 49527
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=49527
Author:   nazgul
Date:     2012-08-03 10:55:33 +0000 (Fri, 03 Aug 2012)
Log Message:
-----------
Tomato Cycles: fix own regression in currently rendering tile status

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

Modified: branches/soc-2011-tomato/intern/cycles/render/session.cpp
===================================================================
--- branches/soc-2011-tomato/intern/cycles/render/session.cpp	2012-08-03 10:51:29 UTC (rev 49526)
+++ branches/soc-2011-tomato/intern/cycles/render/session.cpp	2012-08-03 10:55:33 UTC (rev 49527)
@@ -652,7 +652,8 @@
 	int num_samples = tile_manager.state.num_samples;
 	int resolution = tile_manager.state.resolution;
 	int num_tiles = tile_manager.state.num_tiles;
-	int tile = num_tiles - tile_manager.state.tiles.size();
+	int num_rendered_tiles = tile_manager.state.num_rendered_tiles;
+	int tile = num_tiles - num_rendered_tiles;
 
 	/* update status */
 	string status, substatus;

Modified: branches/soc-2011-tomato/intern/cycles/render/tile.cpp
===================================================================
--- branches/soc-2011-tomato/intern/cycles/render/tile.cpp	2012-08-03 10:51:29 UTC (rev 49526)
+++ branches/soc-2011-tomato/intern/cycles/render/tile.cpp	2012-08-03 10:55:33 UTC (rev 49527)
@@ -60,6 +60,7 @@
 	state.buffer = BufferParams();
 	state.sample = -1;
 	state.num_tiles = 0;
+	state.num_rendered_tiles = 0;
 	state.num_samples = 0;
 	state.resolution = start_resolution;
 	state.tiles.clear();
@@ -160,6 +161,7 @@
 	if (best != state.tiles.end()) {
 		best->rendering = true;
 		tile = *best;
+		state.num_rendered_tiles++;
 
 		return true;
 	}

Modified: branches/soc-2011-tomato/intern/cycles/render/tile.h
===================================================================
--- branches/soc-2011-tomato/intern/cycles/render/tile.h	2012-08-03 10:51:29 UTC (rev 49526)
+++ branches/soc-2011-tomato/intern/cycles/render/tile.h	2012-08-03 10:55:33 UTC (rev 49527)
@@ -53,6 +53,7 @@
 		int num_samples;
 		int resolution;
 		int num_tiles;
+		int num_rendered_tiles;
 		list<Tile> tiles;
 	} state;