blender
/
blender
129
398
Fork 572
Code Issues 6.2k Pull Requests 748 Projects 19 Wiki Activity

Fix T52490: NDOF orbit doesn't lock in ortho view 

Regression in af3f7db caused by own fix for T51324
This commit is contained in:
Campbell Barton 2017-08-24 00:47:47 +10:00 committed by Bastien Montagne
parent 76e8dcafa3
commit 0ed5605bd5
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
source/blender/editors/space_view3d/view3d_edit.c
View File

@ -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,