diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2014-02-19 14:30:57 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2014-02-19 14:30:57 +0400 |
| commit | 892be8edf7bc69ad710a18046fc5209b2456e064 (patch) | |
| tree | 59f968fa5b26bb2a8f166f17154539d2fd63ba51 | |
| parent | d56ed8dcd95ba31dc860b01d692a93ccd1ba1fce (diff) | |
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.
| -rw-r--r-- | source/blender/editors/interface/resources.c | 2 | ||||
| -rw-r--r-- | source/blender/editors/space_view3d/view3d_edit.c | 4 |
2 files changed, 4 insertions, 2 deletions
diff --git a/source/blender/editors/interface/resources.c b/source/blender/editors/interface/resources.c index f6f5f1b1fc1..4b7c25d8f54 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 3d4cee41227..03c0063babe 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); |