[Bf-blender-cvs] [892be8e] master: NDOF: fix helicopter fly option, revert default to trackball.

[Campbell Barton]

Commit: 892be8edf7bc69ad710a18046fc5209b2456e064
Author: Campbell Barton
Date:   Wed Feb 19 21:30:57 2014 +1100
https://developer.blender.org/rB892be8edf7bc69ad710a18046fc5209b2456e064

NDOF: fix helicopter fly option, revert default to trackball.

Rationale for using trackball is that it allows roll which you expect
with an ndof device.

===================================================================

M	source/blender/editors/interface/resources.c
M	source/blender/editors/space_view3d/view3d_edit.c

===================================================================

diff --git a/source/blender/editors/interface/resources.c b/source/blender/editors/interface/resources.c
index f6f5f1b..4b7c25d 100644
--- a/source/blender/editors/interface/resources.c
+++ b/source/blender/editors/interface/resources.c
@@ -2449,8 +2449,6 @@ void init_userdef_factory(void)
 	U.versions = 1;
 	U.savetime = 2;
 
-	U.ndof_flag |= NDOF_TURNTABLE;
-
 	{
 		Mesh *me;
 		for (me = G.main->mesh.first; me; me = me->id.next) {
diff --git a/source/blender/editors/space_view3d/view3d_edit.c b/source/blender/editors/space_view3d/view3d_edit.c
index 3d4cee4..03c0063 100644
--- a/source/blender/editors/space_view3d/view3d_edit.c
+++ b/source/blender/editors/space_view3d/view3d_edit.c
@@ -1333,6 +1333,10 @@ void view3d_ndof_fly(
 		mul_v3_fl(trans, speed * dt);
 		trans_orig_y = trans[1];
 
+		if (U.ndof_flag & NDOF_FLY_HELICOPTER) {
+			trans[1] = 0.0f;
+		}
+
 		/* transform motion from view to world coordinates */
 		mul_qt_v3(view_inv, trans);