diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2014-02-24 10:21:25 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2014-02-24 10:21:25 +0400 |
| commit | 5e11f7f6109b1057487005cbde93dae6a1c30f62 (patch) | |
| tree | bee21b1a7ccb92b1b441ce8e51c16c4ebb34d7f4 /source/blender/editors/space_view3d/view3d_edit.c | |
| parent | 021b07e87c8cdf5e2b3f73e1e3d75baebaaba388 (diff) | |
Fix for recent changes with NDOF
Diffstat (limited to 'source/blender/editors/space_view3d/view3d_edit.c')
| -rw-r--r-- | source/blender/editors/space_view3d/view3d_edit.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/editors/space_view3d/view3d_edit.c b/source/blender/editors/space_view3d/view3d_edit.c index 0849eb1dac0..26d79e9910f 100644 --- a/source/blender/editors/space_view3d/view3d_edit.c +++ b/source/blender/editors/space_view3d/view3d_edit.c @@ -1636,7 +1636,7 @@ static int ndof_pan_invoke(bContext *C, wmOperator *UNUSED(op), const wmEvent *e /* we're panning here! so erase any leftover rotation from other operators */ rv3d->rot_angle = 0.0f; - if (has_translate == false) + if (!(has_translate || has_zoom)) return OPERATOR_CANCELLED; ED_view3d_camera_lock_init_ex(v3d, rv3d, false); |