From 7db13b989a2ca49252eeaffeb1cfc9fe61bb03e5 Mon Sep 17 00:00:00 2001 From: Brecht Van Lommel Date: Thu, 12 Apr 2012 11:42:18 +0000 Subject: Fix: cycles not using local 3d view camera when it is decoupled from the scene. --- intern/cycles/blender/blender_camera.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'intern/cycles/blender/blender_camera.cpp') diff --git a/intern/cycles/blender/blender_camera.cpp b/intern/cycles/blender/blender_camera.cpp index e7704c5f885..def1c64c0f0 100644 --- a/intern/cycles/blender/blender_camera.cpp +++ b/intern/cycles/blender/blender_camera.cpp @@ -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); -- cgit v1.2.3