[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [45566] trunk/blender/intern/cycles/ blender/blender_camera.cpp: Fix: cycles not using local 3d view camera when it is decoupled from the scene.

[Brecht Van Lommel]

Revision: 45566
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=45566
Author:   blendix
Date:     2012-04-12 11:42:18 +0000 (Thu, 12 Apr 2012)
Log Message:
-----------
Fix: cycles not using local 3d view camera when it is decoupled from the scene.

Modified Paths:
--------------
    trunk/blender/intern/cycles/blender/blender_camera.cpp

Modified: trunk/blender/intern/cycles/blender/blender_camera.cpp
===================================================================
--- trunk/blender/intern/cycles/blender/blender_camera.cpp	2012-04-12 11:37:51 UTC (rev 45565)
+++ trunk/blender/intern/cycles/blender/blender_camera.cpp	2012-04-12 11:42:18 UTC (rev 45566)
@@ -288,7 +288,7 @@
 
 	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);