[Bf-blender-cvs] [76d695f7611] master: Fix T52490: NDOF orbit doesn't lock in ortho view
Campbell Barton
noreply at git.blender.org
Wed Aug 23 16:47:11 CEST 2017
Commit: 76d695f7611dfe3f2560525771399008f0bf9f40
Author: Campbell Barton
Date: Thu Aug 24 00:47:47 2017 +1000
Branches: master
https://developer.blender.org/rB76d695f7611dfe3f2560525771399008f0bf9f40
Fix T52490: NDOF orbit doesn't lock in ortho view
Regression in af3f7db caused by own fix for T51324
===================================================================
M source/blender/editors/space_view3d/view3d_edit.c
===================================================================
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,
More information about the Bf-blender-cvs
mailing list