diff options
author | Campbell Barton <campbell@blender.org> | 2022-02-23 13:25:46 +0300 |
---|---|---|
committer | Campbell Barton <campbell@blender.org> | 2022-02-23 13:25:46 +0300 |
commit | 391c3848b1326db1c29fc5c5f791d732d7d282a3 (patch) | |
tree | 9c835b3618a8177b5b724454f635e0f19d0f171d /release | |
parent | 34294449059744ba4b3d4b16eb5fb14a48c16265 (diff) |
NDOF: make camera view/pan behavior optional
User request since adding this option in:
51975b89edfcc02131f1f8248e1b3442ea2778fa
When disabled, use the previous behavior when orbiting a camera view.
Diffstat (limited to 'release')
-rw-r--r-- | release/datafiles/userdef/userdef_default.c | 2 | ||||
-rw-r--r-- | release/scripts/startup/bl_ui/space_userpref.py | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/release/datafiles/userdef/userdef_default.c b/release/datafiles/userdef/userdef_default.c index 34168cc0126..7cf8158c42d 100644 --- a/release/datafiles/userdef/userdef_default.c +++ b/release/datafiles/userdef/userdef_default.c @@ -144,7 +144,7 @@ const UserDef U_default = { * so invert this by default, see: T67579. */ NDOF_ROTX_INVERT_AXIS | NDOF_ROTY_INVERT_AXIS | NDOF_ROTZ_INVERT_AXIS | NDOF_PANX_INVERT_AXIS | NDOF_PANY_INVERT_AXIS | NDOF_PANZ_INVERT_AXIS | - NDOF_ZOOM_INVERT), + NDOF_ZOOM_INVERT | NDOF_CAMERA_PAN_ZOOM), .image_draw_method = IMAGE_DRAW_METHOD_AUTO, .glalphaclip = 0.004, .autokey_mode = (AUTOKEY_MODE_NORMAL & ~AUTOKEY_ON), diff --git a/release/scripts/startup/bl_ui/space_userpref.py b/release/scripts/startup/bl_ui/space_userpref.py index fc1911910c4..f80ad378b3c 100644 --- a/release/scripts/startup/bl_ui/space_userpref.py +++ b/release/scripts/startup/bl_ui/space_userpref.py @@ -1718,6 +1718,7 @@ class USERPREF_PT_ndof_settings(Panel): if show_3dview_settings: col.prop(props, "ndof_show_guide") col.prop(props, "ndof_zoom_invert") + col.prop(props, "ndof_lock_camera_pan_zoom") row = col.row(heading="Pan") row.prop(props, "ndof_pan_yz_swap_axis", text="Swap Y and Z Axes") |