blender
/
blender
136
406
Fork 587
Code Issues 6.2k Pull Requests 754 Projects 19 Wiki Activity

Merge branch 'blender-v3.0-release'

This commit is contained in:
Campbell Barton 2021-11-01 17:16:53 +11:00
parent 55ce05e0bb 3cd398f16f
commit de4793e0e6
1 changed files with 1 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -673,7 +673,6 @@ static void viewrotate_apply_snap(ViewOpsData *vod)
float zaxis_best[3];
int x, y, z;
bool found = false;
bool is_axis_aligned = false;
invert_qt_qt_normalized(viewquat_inv, vod->curr.viewquat);
@ -691,10 +690,6 @@ static void viewrotate_apply_snap(ViewOpsData *vod)
if (angle_normalized_v3v3(zaxis_test, zaxis) < axis_limit) {
copy_v3_v3(zaxis_best, zaxis_test);
found = true;
if (abs(x) + abs(y) + abs(z) == 1) {
is_axis_aligned = true;
}
}
}
}
@ -767,7 +762,7 @@ static void viewrotate_apply_snap(ViewOpsData *vod)
viewrotate_apply_dyn_ofs(vod, rv3d->viewquat);
if (U.uiflag & USER_AUTOPERSP) {
if (is_axis_aligned) {
if (RV3D_VIEW_IS_AXIS(rv3d->view)) {
if (rv3d->persp == RV3D_PERSP) {
rv3d->persp = RV3D_ORTHO;
}