[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [32938] trunk/blender/source/blender/ editors/space_view3d/view3d_edit.c: change from recent commit.

[Campbell Barton]

Revision: 32938
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=32938
Author:   campbellbarton
Date:     2010-11-08 04:55:03 +0100 (Mon, 08 Nov 2010)

Log Message:
-----------
change from recent commit. when orbiting out of the camera view switch to the last used perspective.

Modified Paths:
--------------
    trunk/blender/source/blender/editors/space_view3d/view3d_edit.c

Modified: trunk/blender/source/blender/editors/space_view3d/view3d_edit.c
===================================================================
--- trunk/blender/source/blender/editors/space_view3d/view3d_edit.c	2010-11-08 03:44:52 UTC (rev 32937)
+++ trunk/blender/source/blender/editors/space_view3d/view3d_edit.c	2010-11-08 03:55:03 UTC (rev 32938)
@@ -757,8 +757,9 @@
 	/* switch from camera view when: */
 	if(vod->rv3d->persp != RV3D_PERSP) {
 
-		if (U.uiflag & USER_AUTOPERSP)
+		if (U.uiflag & USER_AUTOPERSP) {
 			vod->rv3d->persp= RV3D_PERSP;
+		}
 		else if(vod->rv3d->persp==RV3D_CAMOB) {
 
 			/* changed since 2.4x, use the camera view */
@@ -766,15 +767,10 @@
 
 			if(v3d->camera) {
 				view3d_settings_from_ob(v3d->camera, rv3d->ofs, rv3d->viewquat, &rv3d->dist, NULL);
-				if(v3d->camera->type == OB_CAMERA) {
-					/* overwrite setting from above with cameras perspective */
-					vod->rv3d->persp= (((Camera *)v3d->camera->data)->type==CAM_ORTHO) ? RV3D_ORTHO : RV3D_PERSP;
-				}
 			}
-			
-			/* if not overwritten above */
+
 			if(vod->rv3d->persp==RV3D_CAMOB) {
-				vod->rv3d->persp= RV3D_PERSP;
+				vod->rv3d->persp= vod->rv3d->lpersp;
 			}
 		}
 		ED_region_tag_redraw(vod->ar);