diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2014-02-24 17:57:10 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2014-02-24 18:04:18 +0400 |
| commit | dde6642dde4981c35b2a7317bae5df48980828b1 (patch) | |
| tree | 0ad6bbe39b3bdfad4567232b2505d95e42439e0d /source/blender/editors | |
| parent | 1130c53cdb24b68d1871a03bad59fad9e6418f29 (diff) | |
Fix T38784: smoothview using perspective transition with ortho camera
Diffstat (limited to 'source/blender/editors')
| -rw-r--r-- | source/blender/editors/space_view3d/view3d_view.c | 6 |
1 files changed, 5 insertions, 1 deletions
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; |