diff options
| author | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2012-04-13 21:42:03 +0400 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2012-04-13 21:42:03 +0400 |
| commit | b219b5294b15cff95030a15b929d3c7bbf5d35c7 (patch) | |
| tree | dd91b7247797439f77b249c2229f67c832a0325d /intern/cycles/blender/blender_session.cpp | |
| parent | 440f4492656ec26c90017976553909b48e93c3fa (diff) | |
Fix #30376: cycles ignores camera override from sequencer.
Diffstat (limited to 'intern/cycles/blender/blender_session.cpp')
| -rw-r--r-- | intern/cycles/blender/blender_session.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/intern/cycles/blender/blender_session.cpp b/intern/cycles/blender/blender_session.cpp index a5471655b5f..dc6c69e2904 100644 --- a/intern/cycles/blender/blender_session.cpp +++ b/intern/cycles/blender/blender_session.cpp @@ -96,7 +96,7 @@ void BlenderSession::create_session() if(b_rv3d) sync->sync_view(b_v3d, b_rv3d, width, height); else - sync->sync_camera(width, height); + sync->sync_camera(b_engine.camera_override(), width, height); /* create session */ session = new Session(session_params); @@ -314,7 +314,7 @@ void BlenderSession::synchronize() if(b_rv3d) sync->sync_view(b_v3d, b_rv3d, width, height); else - sync->sync_camera(width, height); + sync->sync_camera(b_engine.camera_override(), width, height); /* unlock */ session->scene->mutex.unlock(); |