blender
/
blender
129
398
Fork 572
Code Issues 6.2k Pull Requests 748 Projects 19 Wiki Activity

Gizmo: change axis used for shear handles 

The shear direction should be more obvious this way.
This commit is contained in:
Campbell Barton 2018-10-17 17:47:09 +11:00
parent 80fb943e4f
commit 8e071e76de
1 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
source/blender/editors/transform/transform_gizmo_3d.c
View File

@ -2078,12 +2078,20 @@ static void WIDGETGROUP_xform_shear_refresh(const bContext *C, wmGizmoGroup *gzg
WM_gizmo_set_flag(gz, WM_GIZMO_MOVE_CURSOR, true);
wmGizmoOpElem *gzop = WM_gizmo_operator_get(gz, 0);
const int i_ortho = (i + j + 1) % 3;
WM_gizmo_set_matrix_rotation_from_yz_axis(gz, rv3d->twmat[i_ortho], rv3d->twmat[i]);
const int i_ortho_a = (i + j + 1) % 3;
const int i_ortho_b = (i + (1 - j) + 1) % 3;
WM_gizmo_set_matrix_rotation_from_yz_axis(gz, rv3d->twmat[i_ortho_a], rv3d->twmat[i]);
WM_gizmo_set_matrix_location(gz, rv3d->twmat[3]);
RNA_float_set_array(&gzop->ptr, "axis", tbounds.axis[i]);
RNA_float_set_array(&gzop->ptr, "axis_ortho", tbounds.axis[i_ortho]);
float axis[3];
if (j == 0) {
copy_v3_v3(axis, tbounds.axis[i_ortho_b]);
}
else {
negate_v3_v3(axis, tbounds.axis[i_ortho_b]);
}
RNA_float_set_array(&gzop->ptr, "axis", axis);
RNA_float_set_array(&gzop->ptr, "axis_ortho", tbounds.axis[i_ortho_a]);
mul_v3_fl(gz->matrix_basis[0], 0.5f);
mul_v3_fl(gz->matrix_basis[1], 6.0f);
}