[Bf-blender-cvs] [54f4336] master: View3D: disable auto-perspective when orbiting the view out of a camera.

[Campbell Barton]

Commit: 54f4336ebb83a6d84c96aa148bf4cc89331ffd9f
Author: Campbell Barton
Date:   Tue Nov 26 10:32:29 2013 +1100
http://developer.blender.org/rB54f4336ebb83a6d84c96aa148bf4cc89331ffd9f

View3D: disable auto-perspective when orbiting the view out of a camera.

===================================================================

M	source/blender/editors/space_view3d/view3d_edit.c

===================================================================

diff --git a/source/blender/editors/space_view3d/view3d_edit.c b/source/blender/editors/space_view3d/view3d_edit.c
index 4f13e23..372f872 100644
--- a/source/blender/editors/space_view3d/view3d_edit.c
+++ b/source/blender/editors/space_view3d/view3d_edit.c
@@ -993,8 +993,7 @@ static int viewrotate_invoke(bContext *C, wmOperator *op, const wmEvent *event)
 	/* switch from camera view when: */
 	if (vod->rv3d->persp != RV3D_PERSP) {
 		if (vod->rv3d->persp == RV3D_CAMOB) {
-			const short lpersp = (U.uiflag & USER_AUTOPERSP) ? RV3D_PERSP : vod->rv3d->lpersp;
-			view3d_persp_switch_from_camera(vod->v3d, vod->rv3d, lpersp);
+			view3d_persp_switch_from_camera(vod->v3d, vod->rv3d, vod->rv3d->lpersp);
 		}
 		else if ((U.uiflag & USER_AUTOPERSP) && RV3D_VIEW_IS_AXIS(vod->rv3d->view)) {
 			if (!ED_view3d_camera_lock_check(vod->v3d, vod->rv3d)) {