diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2014-02-17 15:05:10 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2014-02-17 15:05:10 +0400 |
| commit | d8d7d8e1e3c18bee520f308eead4cf967fbd7b87 (patch) | |
| tree | f937fd7c4238c8d8a6b466fcdbb395a1ee241f10 /source | |
| parent | aa0aa737039aa0f6b78bde779dba7a60fd8c417b (diff) | |
NDOF: allow panning in view3d.ndof_orbit_zoom, but forward is still zoom
This makes it so NDOF without any modifiers pressed can pan and orbit
which means you have full 6dof, however if you only want to orbit+zoom
that works as before.
also change logic so rotation is disabled for axis views (orbit operator
will exit axis views still, as with mouse orbit)
Diffstat (limited to 'source')
| -rw-r--r-- | source/blender/editors/space_view3d/view3d_edit.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/editors/space_view3d/view3d_edit.c b/source/blender/editors/space_view3d/view3d_edit.c index 914b698b7bc..8a11b336fd5 100644 --- a/source/blender/editors/space_view3d/view3d_edit.c +++ b/source/blender/editors/space_view3d/view3d_edit.c @@ -1435,9 +1435,9 @@ static int ndof_orbit_zoom_invoke(bContext *C, wmOperator *op, const wmEvent *ev rv3d->rot_angle = 0.0f; if (ndof->progress != P_FINISHING) { - const bool has_rotation = NDOF_HAS_ROTATE; + const bool has_rotation = NDOF_HAS_ROTATE && (RV3D_VIEW_IS_AXIS(rv3d->view) == false); /* if we can't rotate, fallback to translate (locked axis views) */ - const bool has_translate = NDOF_HAS_TRANSLATE && (rv3d->viewlock & RV3D_LOCKED); + const bool has_translate = NDOF_HAS_TRANSLATE; /* always zoom since this is the main purpose of the function */ const bool has_zoom = true; |