archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

Fix #30376: cycles ignores camera override from sequencer.

Browse Source
This commit is contained in:
Brecht Van Lommel
2012-04-13 17:42:03 +00:00
parent 440f449265
commit b219b5294b
6 changed files with 13 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
intern/cycles/blender/blender_camera.cpp
View File

@@ -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());