diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2017-08-23 17:47:47 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2017-08-23 17:51:25 +0300 |
| commit | 76d695f7611dfe3f2560525771399008f0bf9f40 (patch) | |
| tree | c9d5bceae8ddd6146e2bd1a602873c61e05de075 /source/blender | |
| parent | 520ea73ad0208ee22330d7a8c64b64d7fbb072b4 (diff) | |
Fix T52490: NDOF orbit doesn't lock in ortho view
Regression in af3f7db caused by own fix for T51324
Diffstat (limited to 'source/blender')
| -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 b524119019b..863024514cc 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, |