[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [53662] trunk/blender/intern/cycles: Fix for recent tile_order feature not working properly with persistent data

[Sergey Sharybin]

Revision: 53662
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=53662
Author:   nazgul
Date:     2013-01-08 16:56:04 +0000 (Tue, 08 Jan 2013)
Log Message:
-----------
Fix for recent tile_order feature not working properly with persistent data

Modified Paths:
--------------
    trunk/blender/intern/cycles/blender/blender_session.cpp
    trunk/blender/intern/cycles/render/tile.h

Modified: trunk/blender/intern/cycles/blender/blender_session.cpp
===================================================================
--- trunk/blender/intern/cycles/blender/blender_session.cpp	2013-01-08 16:54:26 UTC (rev 53661)
+++ trunk/blender/intern/cycles/blender/blender_session.cpp	2013-01-08 16:56:04 UTC (rev 53662)
@@ -139,6 +139,8 @@
 	session->progress.reset();
 	scene->reset();
 
+	session->tile_manager.set_tile_order(session_params.tile_order);
+
 	/* peak memory usage should show current render peak, not peak for all renders
 	 * made by this render session
 	 */

Modified: trunk/blender/intern/cycles/render/tile.h
===================================================================
--- trunk/blender/intern/cycles/render/tile.h	2013-01-08 16:54:26 UTC (rev 53661)
+++ trunk/blender/intern/cycles/render/tile.h	2013-01-08 16:56:04 UTC (rev 53662)
@@ -68,6 +68,7 @@
 	bool next_tile(Tile& tile, int device = 0);
 	bool done();
 
+	void set_tile_order(int tile_order_) { tile_order = tile_order_; }
 protected:
 	/* Note: this should match enum_tile_order in properties.py */
 	enum {