diff options
| author | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2012-04-12 15:42:18 +0400 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2012-04-12 15:42:18 +0400 |
| commit | 7db13b989a2ca49252eeaffeb1cfc9fe61bb03e5 (patch) | |
| tree | 7769ca1d9c35ee300789fd5e6488f8736e132a50 /intern/cycles/blender/blender_camera.cpp | |
| parent | e6c45cc1de178c083fbcbcc83f2438ff8575b7b0 (diff) | |
Fix: cycles not using local 3d view camera when it is decoupled from the scene.
Diffstat (limited to 'intern/cycles/blender/blender_camera.cpp')
| -rw-r--r-- | intern/cycles/blender/blender_camera.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
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); |