diff options
author | Campbell Barton <ideasman42@gmail.com> | 2017-06-23 07:48:37 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2017-06-23 07:50:44 +0300 |
commit | 0a5d7efab324f5293e86d329d04aba6c0deaecad (patch) | |
tree | eda1655729485057e99e1eb6bb7c2c92c5c1be18 /source/blender/editors/mesh | |
parent | 12b985f1b198972ed8d33518ac5c00470c382a95 (diff) |
Manipulator: rename struct members
Rename:
- matrix -> matrix_basis
- user_scale -> scale_basis
- scale -> scale_final
Match RNA names being added to custom-manipulator branch.
Diffstat (limited to 'source/blender/editors/mesh')
-rw-r--r-- | source/blender/editors/mesh/editmesh_bisect.c | 4 | ||||
-rw-r--r-- | source/blender/editors/mesh/editmesh_extrude.c | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/source/blender/editors/mesh/editmesh_bisect.c b/source/blender/editors/mesh/editmesh_bisect.c index 8f1ba716b83..d6dd3fbaa64 100644 --- a/source/blender/editors/mesh/editmesh_bisect.c +++ b/source/blender/editors/mesh/editmesh_bisect.c @@ -469,7 +469,7 @@ static void manipulator_bisect_prop_depth_get( RNA_property_float_get_array(op->ptr, man->data.prop_plane_co, plane_co); RNA_property_float_get_array(op->ptr, man->data.prop_plane_no, plane_no); - value[0] = dot_v3v3(plane_no, plane_co) - dot_v3v3(plane_no, mpr->matrix[3]); + value[0] = dot_v3v3(plane_no, plane_co) - dot_v3v3(plane_no, mpr->matrix_basis[3]); } static void manipulator_bisect_prop_depth_set( @@ -487,7 +487,7 @@ static void manipulator_bisect_prop_depth_set( RNA_property_float_get_array(op->ptr, man->data.prop_plane_no, plane); normalize_v3(plane); - plane[3] = -value[0] - dot_v3v3(plane, mpr->matrix[3]); + plane[3] = -value[0] - dot_v3v3(plane, mpr->matrix_basis[3]); /* Keep our location, may be offset simply to be inside the viewport. */ closest_to_plane_normalized_v3(plane_co, plane, plane_co); diff --git a/source/blender/editors/mesh/editmesh_extrude.c b/source/blender/editors/mesh/editmesh_extrude.c index 224ce5cfeb8..ce25d3f1a15 100644 --- a/source/blender/editors/mesh/editmesh_extrude.c +++ b/source/blender/editors/mesh/editmesh_extrude.c @@ -903,7 +903,7 @@ static void manipulator_spin_prop_depth_get( 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); - value[0] = dot_v3v3(plane_no, plane_co) - dot_v3v3(plane_no, mpr->matrix[3]); + value[0] = dot_v3v3(plane_no, plane_co) - dot_v3v3(plane_no, mpr->matrix_basis[3]); } static void manipulator_spin_prop_depth_set( @@ -921,7 +921,7 @@ static void manipulator_spin_prop_depth_set( RNA_property_float_get_array(op->ptr, man->data.prop_axis_no, plane); normalize_v3(plane); - plane[3] = -value[0] - dot_v3v3(plane, mpr->matrix[3]); + plane[3] = -value[0] - dot_v3v3(plane, mpr->matrix_basis[3]); /* Keep our location, may be offset simply to be inside the viewport. */ closest_to_plane_normalized_v3(plane_co, plane, plane_co); |