diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2017-08-15 10:13:32 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2017-08-15 10:13:32 +0300 |
| commit | ecfc0370e0fe74a8cffebb3d99615cb569eabe5b (patch) | |
| tree | 296b93ae061193619e2bdb0ca3eed5135123bb68 /source/blender/editors/mesh | |
| parent | dfb890947d036bca735abcc56d55bd2572aefcb3 (diff) | |
Manipulator: grab3d use own vars to store offset
Was complicating general use case, also support for transforming with matrix_space set.
Add matrix_space support for manipulator_window_project_2d too.
Diffstat (limited to 'source/blender/editors/mesh')
| -rw-r--r-- | source/blender/editors/mesh/editmesh_bisect.c | 2 | ||||
| -rw-r--r-- | source/blender/editors/mesh/editmesh_extrude.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/editors/mesh/editmesh_bisect.c b/source/blender/editors/mesh/editmesh_bisect.c index 5f50ce1f37b..228677a51c8 100644 --- a/source/blender/editors/mesh/editmesh_bisect.c +++ b/source/blender/editors/mesh/editmesh_bisect.c @@ -428,8 +428,8 @@ static void manipulator_mesh_bisect_update_from_op(ManipulatorGroup *man) RNA_property_float_get_array(op->ptr, man->data.prop_plane_no, plane_no); 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); + /* translate_c location comes from the property. */ WM_manipulator_set_matrix_rotation_from_z_axis(man->translate_z, plane_no); diff --git a/source/blender/editors/mesh/editmesh_extrude.c b/source/blender/editors/mesh/editmesh_extrude.c index aa1d18b18c9..e7fcad9e633 100644 --- a/source/blender/editors/mesh/editmesh_extrude.c +++ b/source/blender/editors/mesh/editmesh_extrude.c @@ -861,9 +861,9 @@ static void manipulator_mesh_spin_update_from_op(ManipulatorSpinGroup *man) RNA_property_float_get_array(op->ptr, man->data.prop_axis_no, plane_no); 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); + /* translate_c location comes from the property. */ 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); |