From dde6642dde4981c35b2a7317bae5df48980828b1 Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Tue, 25 Feb 2014 00:57:10 +1100 Subject: [PATCH] Fix T38784: smoothview using perspective transition with ortho camera --- source/blender/editors/space_view3d/view3d_view.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/source/blender/editors/space_view3d/view3d_view.c b/source/blender/editors/space_view3d/view3d_view.c index dbf837bcd2e..0c3a2b853aa 100644 --- a/source/blender/editors/space_view3d/view3d_view.c +++ b/source/blender/editors/space_view3d/view3d_view.c @@ -265,7 +265,11 @@ void ED_view3d_smooth_view(bContext *C, View3D *v3d, ARegion *ar, Object *oldcam /* ensure it shows correct */ if (sms.to_camera) { - rv3d->persp = RV3D_PERSP; + /* use ortho if we move from an ortho view to an ortho camera */ + rv3d->persp = (((rv3d->is_persp == false) && + (camera->type == OB_CAMERA) && + (((Camera *)camera->data)->type == CAM_ORTHO)) ? + RV3D_ORTHO : RV3D_PERSP); } rv3d->rflag |= RV3D_NAVIGATING;