rename RNA_property_is_set() --> RNA_struct_property_is_set() in preperation to add...
[blender.git] / source / blender / editors / object / object_constraint.c
index fa4f50e240f8e398e088539493351f9e0c828b2f..a90edb29c29543dd2257fa2288772ec1c1a40945 100644 (file)
@@ -542,7 +542,7 @@ static int edit_constraint_poll(bContext *C)
 
 static void edit_constraint_properties(wmOperatorType *ot)
 {
-       RNA_def_string(ot->srna, "constraint", "", 32, "Constraint", "Name of the constraint to edit");
+       RNA_def_string(ot->srna, "constraint", "", MAX_NAME, "Constraint", "Name of the constraint to edit");
        RNA_def_enum(ot->srna, "owner", constraint_owner_items, 0, "Owner", "The owner of this constraint");
 }
 
@@ -553,7 +553,7 @@ static int edit_constraint_invoke_properties(bContext *C, wmOperator *op)
        bConstraint *con;
        ListBase *list;
        
-       if (RNA_property_is_set(op->ptr, "constraint") && RNA_property_is_set(op->ptr, "owner"))
+       if (RNA_struct_property_is_set(op->ptr, "constraint") && RNA_struct_property_is_set(op->ptr, "owner"))
                return 1;
        
        if (ptr.data) {
@@ -575,7 +575,7 @@ static int edit_constraint_invoke_properties(bContext *C, wmOperator *op)
 
 static bConstraint *edit_constraint_property_get(wmOperator *op, Object *ob, int type)
 {
-       char constraint_name[32];
+       char constraint_name[MAX_NAME];
        int owner = RNA_enum_get(op->ptr, "owner");
        bConstraint *con;
        ListBase *list=NULL;
@@ -754,7 +754,7 @@ static void child_get_inverse_matrix (Scene *scene, Object *ob, bConstraint *con
                 * the effect of the constraint
                 */
                invert_m4_m4(imat, pchan->pose_mat);
-               mul_m4_m4m4(tmat, imat, pmat);
+               mult_m4_m4m4(tmat, pmat, imat);
                invert_m4_m4(invmat, tmat);
                
                /* 5. restore constraints */