[Bf-blender-cvs] [0ed5605bd58] blender-v2.79-release: Fix T52490: NDOF orbit doesn't lock in ortho view

[Campbell Barton]

Commit: 0ed5605bd582a0a22ad2e6d3c2cdbdb17c52bf37
Author: Campbell Barton
Date:   Thu Aug 24 00:47:47 2017 +1000
Branches: blender-v2.79-release
https://developer.blender.org/rB0ed5605bd582a0a22ad2e6d3c2cdbdb17c52bf37

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