diff options
author | Sergey Sharybin <sergey.vfx@gmail.com> | 2015-02-17 14:23:03 +0300 |
---|---|---|
committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2015-02-17 14:25:16 +0300 |
commit | 4660c00ac57effeb9598bb3083900dc354a4f43f (patch) | |
tree | 6e0e38abad5ecb36f15ea80e0e22c639213cb2dc /intern/cycles/blender/blender_sync.cpp | |
parent | 7307f3b48564191dfcf2ccd71e730c41c6486289 (diff) |
Cycles: Make blender session aware of rendering from command line
This way we can do some more aggressive policy about releasing temporary
data during synchronization.
Diffstat (limited to 'intern/cycles/blender/blender_sync.cpp')
-rw-r--r-- | intern/cycles/blender/blender_sync.cpp | 15 |
1 files changed, 12 insertions, 3 deletions
diff --git a/intern/cycles/blender/blender_sync.cpp b/intern/cycles/blender/blender_sync.cpp index 79ee6d51196..fb32f67d71a 100644 --- a/intern/cycles/blender/blender_sync.cpp +++ b/intern/cycles/blender/blender_sync.cpp @@ -407,7 +407,11 @@ bool BlenderSync::get_session_pause(BL::Scene b_scene, bool background) return (background)? false: get_boolean(cscene, "preview_pause"); } -SessionParams BlenderSync::get_session_params(BL::RenderEngine b_engine, BL::UserPreferences b_userpref, BL::Scene b_scene, bool background) +SessionParams BlenderSync::get_session_params(BL::RenderEngine b_engine, + BL::UserPreferences b_userpref, + BL::Scene b_scene, + bool background, + bool headless) { SessionParams params; PointerRNA cscene = RNA_pointer_get(&b_scene.ptr, "cycles"); @@ -496,8 +500,13 @@ SessionParams BlenderSync::get_session_params(BL::RenderEngine b_engine, BL::Use params.tile_size = make_int2(tile_x, tile_y); } - - params.tile_order = (TileOrder)RNA_enum_get(&cscene, "tile_order"); + + if(headless == false) { + params.tile_order = (TileOrder)RNA_enum_get(&cscene, "tile_order"); + } + else { + params.tile_order = TILE_BOTTOM_TO_TOP; + } params.start_resolution = get_int(cscene, "preview_start_resolution"); |