Correct error in recent transform refactor
authorCampbell Barton <ideasman42@gmail.com>
Wed, 27 Feb 2019 05:39:03 +0000 (16:39 +1100)
committerCampbell Barton <ideasman42@gmail.com>
Wed, 27 Feb 2019 05:39:03 +0000 (16:39 +1100)
source/blender/editors/transform/transform_gizmo_3d.c
source/blender/editors/transform/transform_ops.c

index efc3bfd..8b50377 100644 (file)
@@ -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);
                        }
index d2b59ea..ef2ecc2 100644 (file)
@@ -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);