diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2017-06-18 00:43:45 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2017-06-18 01:37:50 +0300 |
| commit | f860369ebf58f1ce683a587be136e2bf7dd08372 (patch) | |
| tree | 58869b78f04b04c2ddc4563221afcbdc5b0c5c8c /source/blender/editors/mesh/editmesh_extrude.c | |
| parent | 49be79693c6d2e3be20b2cd0ecf81e76a7121b2f (diff) | |
Manipulator: use matrix for manipulator direction
Remove type-specific axis functions.
Diffstat (limited to 'source/blender/editors/mesh/editmesh_extrude.c')
| -rw-r--r-- | source/blender/editors/mesh/editmesh_extrude.c | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/source/blender/editors/mesh/editmesh_extrude.c b/source/blender/editors/mesh/editmesh_extrude.c index 5b02bf2df8a..e722b89e9b1 100644 --- a/source/blender/editors/mesh/editmesh_extrude.c +++ b/source/blender/editors/mesh/editmesh_extrude.c @@ -858,13 +858,13 @@ static void manipulator_mesh_spin_update_from_op(ManipulatorSpinGroup *man) RNA_property_float_get_array(op->ptr, man->data.prop_axis_co, plane_co); RNA_property_float_get_array(op->ptr, man->data.prop_axis_no, plane_no); - WM_manipulator_set_origin(man->translate_z, plane_co); - WM_manipulator_set_origin(man->translate_c, plane_co); - WM_manipulator_set_origin(man->rotate_c, plane_co); - WM_manipulator_set_origin(man->angle_z, plane_co); + WM_manipulator_set_matrix_location(man->translate_z, plane_co); + WM_manipulator_set_matrix_location(man->translate_c, plane_co); + WM_manipulator_set_matrix_location(man->rotate_c, plane_co); + WM_manipulator_set_matrix_location(man->angle_z, plane_co); - ED_manipulator_arrow3d_set_direction(man->translate_z, plane_no); - ED_manipulator_dial3d_set_up_vector(man->angle_z, plane_no); + WM_manipulator_set_matrix_rotation_from_z_axis(man->translate_z, plane_no); + WM_manipulator_set_matrix_rotation_from_z_axis(man->angle_z, plane_no); WM_manipulator_set_scale(man->translate_c, 0.2); @@ -877,12 +877,12 @@ static void manipulator_mesh_spin_update_from_op(ManipulatorSpinGroup *man) project_plane_normalized_v3_v3v3(man->data.rotate_up, man->data.rotate_up, man->data.rotate_axis); normalize_v3(man->data.rotate_up); - ED_manipulator_grab3d_set_up_vector(man->translate_c, plane_no); - ED_manipulator_dial3d_set_up_vector(man->rotate_c, man->data.rotate_axis); + WM_manipulator_set_matrix_rotation_from_z_axis(man->translate_c, plane_no); + WM_manipulator_set_matrix_rotation_from_yz_axis(man->rotate_c, man->data.rotate_axis, plane_no); /* show the axis instead of mouse cursor */ - ED_manipulator_dial3d_set_start_vector(man->rotate_c, true, plane_no); - ED_manipulator_dial3d_set_double_helper(man->rotate_c, true); + ED_manipulator_dial3d_set_use_start_y_axis(man->rotate_c, true); + ED_manipulator_dial3d_set_use_double_helper(man->rotate_c, true); } } |