diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2019-02-27 08:39:03 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2019-02-27 08:39:03 +0300 |
| commit | 3f23b5ffd5935b260c79dcf58781d976be814044 (patch) | |
| tree | 1bc7a23aad04783eec51932d0b2cad27dea07d26 | |
| parent | b21007757fd642a1c77ff7081832d93b3282a34b (diff) | |
Correct error in recent transform refactor
| -rw-r--r-- | source/blender/editors/transform/transform_gizmo_3d.c | 2 | ||||
| -rw-r--r-- | source/blender/editors/transform/transform_ops.c | 3 |
2 files changed, 1 insertions, 4 deletions
diff --git a/source/blender/editors/transform/transform_gizmo_3d.c b/source/blender/editors/transform/transform_gizmo_3d.c index efc3bfdb5c2..8b50377fb2c 100644 --- a/source/blender/editors/transform/transform_gizmo_3d.c +++ b/source/blender/editors/transform/transform_gizmo_3d.c @@ -2214,7 +2214,7 @@ static void WIDGETGROUP_xform_shear_refresh(const bContext *C, wmGizmoGroup *gzg cross_v3_v3v3(orient_matrix[0], tbounds.axis[i_ortho_a], axis); copy_v3_v3(orient_matrix[1], tbounds.axis[i_ortho_a]); copy_v3_v3(orient_matrix[2], axis); - RNA_float_set_array(&gzop->ptr, "orient_matrix", &orient_matrix[0][0]); + RNA_float_set_array(&gzop->ptr, "constraint_matrix", &orient_matrix[0][0]); mul_v3_fl(gz->matrix_basis[0], 0.5f); mul_v3_fl(gz->matrix_basis[1], 6.0f); } diff --git a/source/blender/editors/transform/transform_ops.c b/source/blender/editors/transform/transform_ops.c index d2b59eac4f1..ef2ecc25315 100644 --- a/source/blender/editors/transform/transform_ops.c +++ b/source/blender/editors/transform/transform_ops.c @@ -547,9 +547,6 @@ void Transform_Properties(struct wmOperatorType *ot, int flags) RNA_def_property_ui_text(prop, "Axis", ""); RNA_def_property_enum_default(prop, 2); RNA_def_property_enum_items(prop, rna_enum_axis_xyz_items); - - prop = RNA_def_float_matrix(ot->srna, "orient_matrix", 3, 3, NULL, 0.0f, 0.0f, "Matrix", "", 0.0f, 0.0f); - RNA_def_property_flag(prop, PROP_HIDDEN | PROP_SKIP_SAVE); } if (flags & P_ORIENT_AXIS_ORTHO) { prop = RNA_def_property(ot->srna, "orient_axis_ortho", PROP_ENUM, PROP_NONE); |