Fix: cycles not using local 3d view camera when it is decoupled from the scene.
authorBrecht Van Lommel <brechtvanlommel@pandora.be>
Thu, 12 Apr 2012 11:42:18 +0000 (11:42 +0000)
committerBrecht Van Lommel <brechtvanlommel@pandora.be>
Thu, 12 Apr 2012 11:42:18 +0000 (11:42 +0000)
intern/cycles/blender/blender_camera.cpp

index e7704c5f885b7245950719d6aeb8c9b87ae2dcd5..def1c64c0f032735c429c3e04f42a065b30f44f2 100644 (file)
@@ -288,7 +288,7 @@ void BlenderSync::sync_view(BL::SpaceView3D b_v3d, BL::RegionView3D b_rv3d, int
 
        if(b_rv3d.view_perspective() == BL::RegionView3D::view_perspective_CAMERA) {
                /* camera view */
-               BL::Object b_ob = b_scene.camera();
+               BL::Object b_ob = (b_v3d.lock_camera_and_layers())? b_scene.camera(): b_v3d.camera();
 
                if(b_ob) {
                        blender_camera_from_object(&bcam, b_ob);