kannonier8/blender
1
0
Fork 0
forked from bartvdbraak/blender
Code Pull Requests Activity

Fix for recent tile_order feature not working properly with persistent data

Browse Source
This commit is contained in:
Sergey Sharybin 2013-01-08 16:56:04 +00:00
parent 4737e08cb9
commit fd35b0aa66
2 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
intern/cycles/blender/blender_session.cpp
View File

@ -139,6 +139,8 @@ void BlenderSession::reset_session(BL::BlendData b_data_, BL::Scene b_scene_)
session->progress.reset(); session->progress.reset();
scene->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 /* peak memory usage should show current render peak, not peak for all renders
* made by this render session * made by this render session
*/ */

1
intern/cycles/render/tile.h
View File

@ -68,6 +68,7 @@ public:
bool next_tile(Tile& tile, int device = 0); bool next_tile(Tile& tile, int device = 0);
bool done(); bool done();
void set_tile_order(int tile_order_) { tile_order = tile_order_; }
protected: protected:
/* Note: this should match enum_tile_order in properties.py */ /* Note: this should match enum_tile_order in properties.py */
enum { enum {