diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2017-08-23 17:47:47 +0300 |
|---|---|---|
| committer | Bastien Montagne <montagne29@wanadoo.fr> | 2017-09-04 13:58:47 +0300 |
| commit | 0ed5605bd582a0a22ad2e6d3c2cdbdb17c52bf37 (patch) | |
| tree | fdfb6ccdf197bad4b7ac157f1c8fa70436e6be13 | |
| parent | 76e8dcafa3c968b51e0692e31f51db6fd50750db (diff) | |
Fix T52490: NDOF orbit doesn't lock in ortho view
Regression in af3f7db caused by own fix for T51324
| -rw-r--r-- | source/blender/editors/space_view3d/view3d_edit.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/source/blender/editors/space_view3d/view3d_edit.c b/source/blender/editors/space_view3d/view3d_edit.c index b2af2fe1d49..6b4cdc28f8e 100644 --- a/source/blender/editors/space_view3d/view3d_edit.c +++ b/source/blender/editors/space_view3d/view3d_edit.c @@ -750,7 +750,8 @@ static void viewops_data_create_ex( vod->use_dyn_ofs = false; } - if (switch_from_camera) { + /* Check we're in the camera view, otherwise we may switch out of axis views, see: T52490 */ + if (switch_from_camera && (rv3d->persp == RV3D_CAMOB)) { /* switch from camera view when: */ if (view3d_ensure_persp(vod->v3d, vod->ar)) { /* If we're switching from camera view to the perspective one, |