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

Fix T72919: NDOF 'Free' orbit preference is ignored

Browse Source 
Regression from 6288dbffb6.
This commit is contained in:
Campbell Barton
2020-01-08 14:20:23 +11:00
parent 0e37045f32
commit a32ee63660
1 changed files with 13 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
source/blender/editors/space_view3d/view3d_edit.c
View File

@@ -1448,10 +1448,20 @@ static int ndof_orbit_zoom_invoke(bContext *C, wmOperator *op, const wmEvent *ev
const bool is_orbit_around_pivot = (U.ndof_flag & NDOF_MODE_ORBIT) ||
ED_view3d_offset_lock_check(v3d, rv3d);
const bool has_rotation = ndof_has_rotate(ndof, rv3d);
const bool has_translate = !is_zero_v2(ndof->tvec) && ndof_has_translate(ndof, v3d, rv3d);
const bool has_zoom = (ndof->tvec[2] != 0.0f);
bool has_translate, has_zoom;
/* Rotation first because dynamic offset resets offset otherwise (and disasbles panning). */
if (is_orbit_around_pivot) {
/* Orbit preference or forced lock (Z zooms). */
has_translate = !is_zero_v2(ndof->tvec) && ndof_has_translate(ndof, v3d, rv3d);
has_zoom = (ndof->tvec[2] != 0.0f);
}
else {
/* Free preference (Z translates). */
has_translate = ndof_has_translate(ndof, v3d, rv3d);
has_zoom = false;
}
/* Rotation first because dynamic offset resets offset otherwise (and disables panning). */
if (has_rotation) {
const float dist_backup = rv3d->dist;
if (!is_orbit_around_pivot) {