[Bf-blender-cvs] [22935e8] cycles_kernel_split: Cycles kernel split: No need to get tile size from manager, it's known in params

[Sergey Sharybin]

Commit: 22935e840bdc20a3ce9b1bff10b2ee2587ef94ae
Author: Sergey Sharybin
Date:   Thu May 7 18:38:50 2015 +0500
Branches: cycles_kernel_split
https://developer.blender.org/rB22935e840bdc20a3ce9b1bff10b2ee2587ef94ae

Cycles kernel split: No need to get tile size from manager, it's known in params

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

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

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

diff --git a/intern/cycles/render/session.cpp b/intern/cycles/render/session.cpp
index 6d22deb..a151dba 100644
--- a/intern/cycles/render/session.cpp
+++ b/intern/cycles/render/session.cpp
@@ -374,7 +374,7 @@ bool Session::acquire_tile(Device *tile_device, RenderTile& rtile)
 	rtile.start_sample = tile_manager.state.sample;
 	rtile.num_samples = tile_manager.state.num_samples;
 	rtile.resolution = tile_manager.state.resolution_divider;
-	rtile.tile_size = tile_manager.get_tile_size();
+	rtile.tile_size = params.tile_size;
 
 	tile_lock.unlock();
 
diff --git a/intern/cycles/render/tile.h b/intern/cycles/render/tile.h
index d8e836d..c9bdc86 100644
--- a/intern/cycles/render/tile.h
+++ b/intern/cycles/render/tile.h
@@ -78,7 +78,6 @@ public:
 	bool next();
 	bool next_tile(Tile& tile, int device = 0);
 	bool done();
-	int2 get_tile_size() { return tile_size; }
 	
 	void set_tile_order(TileOrder tile_order_) { tile_order = tile_order_; }
 protected: