[Bf-blender-cvs] [e9770adf63] master: Cycles: Remove obsolete variable from the TileManager

Lukas Stockner noreply at git.blender.org
Fri Mar 24 19:48:48 CET 2017


Commit: e9770adf6370252993936d6a89c4a2fd7ce17498
Author: Lukas Stockner
Date:   Fri Mar 24 19:43:39 2017 +0100
Branches: master
https://developer.blender.org/rBe9770adf6370252993936d6a89c4a2fd7ce17498

Cycles: Remove obsolete variable from the TileManager

===================================================================

M	intern/cycles/render/tile.cpp
M	intern/cycles/render/tile.h

===================================================================

diff --git a/intern/cycles/render/tile.cpp b/intern/cycles/render/tile.cpp
index a493c3fa1c..76d0b9a57c 100644
--- a/intern/cycles/render/tile.cpp
+++ b/intern/cycles/render/tile.cpp
@@ -131,7 +131,6 @@ void TileManager::reset(BufferParams& params_, int num_samples_)
 	state.buffer = BufferParams();
 	state.sample = range_start_sample - 1;
 	state.num_tiles = 0;
-	state.num_rendered_tiles = 0;
 	state.num_samples = 0;
 	state.resolution_divider = get_divider(params.width, params.height, start_resolution);
 	state.tiles.clear();
@@ -343,7 +342,6 @@ bool TileManager::next_tile(Tile& tile, int device)
 
 	tile = Tile(state.tiles[logical_device].front());
 	state.tiles[logical_device].pop_front();
-	state.num_rendered_tiles++;
 	return true;
 }
 
diff --git a/intern/cycles/render/tile.h b/intern/cycles/render/tile.h
index 5d92ebac35..85fc89bc39 100644
--- a/intern/cycles/render/tile.h
+++ b/intern/cycles/render/tile.h
@@ -63,7 +63,6 @@ public:
 		int num_samples;
 		int resolution_divider;
 		int num_tiles;
-		int num_rendered_tiles;
 
 		/* Total samples over all pixels: Generally num_samples*num_pixels,
 		 * but can be higher due to the initial resolution division for previews. */




More information about the Bf-blender-cvs mailing list