griefith/test
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Merge branch 'blender-v4.5-release'

Browse Source
This commit is contained in:
Campbell Barton
2025-06-14 12:28:52 +10:00
parent d40aee71db ce760b7f0b
commit fac42009ff
1 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
source/blender/editors/interface/view2d/view2d_ops.cc
View File

@@ -1525,7 +1525,7 @@ static wmOperatorStatus view2d_ndof_invoke(bContext *C, wmOperator *op, const wm
/* tune these until it feels right */
const float zoom_sensitivity = 0.5f;
const float speed = 10.0f; /* match view3d ortho */
const float pan_speed = NDOF_PIXELS_PER_SECOND;
const bool has_translate = !is_zero_v2(ndof->tvec) && view_pan_poll(C);
const bool has_zoom = (ndof->tvec[2] != 0.0f) && view_zoom_poll(C);
@@ -1533,8 +1533,7 @@ static wmOperatorStatus view2d_ndof_invoke(bContext *C, wmOperator *op, const wm
WM_event_ndof_pan_get(ndof, pan_vec);
if (has_translate) {
pan_vec[0] *= speed;
pan_vec[1] *= speed;
mul_v2_fl(pan_vec, ndof->dt * pan_speed);
view_pan_init(C, op);