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_camera.cpp | |
| parent | 440f4492656ec26c90017976553909b48e93c3fa (diff) | |
Fix #30376: cycles ignores camera override from sequencer.
Diffstat (limited to 'intern/cycles/blender/blender_camera.cpp')
| -rw-r--r-- | intern/cycles/blender/blender_camera.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/intern/cycles/blender/blender_camera.cpp b/intern/cycles/blender/blender_camera.cpp index def1c64c0f0..a21b22bc35a 100644 --- a/intern/cycles/blender/blender_camera.cpp +++ b/intern/cycles/blender/blender_camera.cpp @@ -250,7 +250,7 @@ static void blender_camera_sync(Camera *cam, BlenderCamera *bcam, int width, int /* Sync Render Camera */ -void BlenderSync::sync_camera(int width, int height) +void BlenderSync::sync_camera(BL::Object b_override, int width, int height) { BlenderCamera bcam; blender_camera_init(&bcam); @@ -264,6 +264,9 @@ void BlenderSync::sync_camera(int width, int height) /* camera object */ BL::Object b_ob = b_scene.camera(); + if(b_override) + b_ob = b_override; + if(b_ob) { blender_camera_from_object(&bcam, b_ob); bcam.matrix = get_transform(b_ob.matrix_world()); |