Comment + whitespace tweaks for constraints
authorJoshua Leung <aligorith@gmail.com>
Sat, 27 Oct 2012 13:22:44 +0000 (13:22 +0000)
committerJoshua Leung <aligorith@gmail.com>
Sat, 27 Oct 2012 13:22:44 +0000 (13:22 +0000)
* Radiant -> Radians

* Noted down revision number for when Jahka removed the old constraint blending
logic. I spent some time hunting this down while trying to check if it might've
caused any obvious changes leading to one of the (now closed) bugreports. Better
to note this in the code then.

source/blender/blenkernel/intern/constraint.c
source/blender/makesrna/intern/rna_constraint.c

index 887a322d91dedb8d314256c181760d6da9d892a9..e300b5e0f19996d2119f15fe1ac7efba2bceb06b 100644 (file)
@@ -2702,7 +2702,7 @@ static void stretchto_evaluate(bConstraint *con, bConstraintOb *cob, ListBase *t
                        default: /* should not happen, but in case*/
                                return;
                } /* switch (data->volmode) */
-
+               
                /* Clear the object's rotation and scale */
                cob->matrix[0][0] = size[0] * scale[0];
                cob->matrix[0][1] = 0;
@@ -2725,10 +2725,10 @@ static void stretchto_evaluate(bConstraint *con, bConstraintOb *cob, ListBase *t
                                /* othogonal to "new Y" "old X! plane */
                                cross_v3_v3v3(orth, vec, xx);
                                normalize_v3(orth);
-
+                               
                                /* new Z*/
                                copy_v3_v3(totmat[2], orth);
-
+                               
                                /* we decided to keep X plane*/
                                cross_v3_v3v3(xx, orth, vec);
                                normalize_v3_v3(totmat[0], xx);
@@ -2738,16 +2738,16 @@ static void stretchto_evaluate(bConstraint *con, bConstraintOb *cob, ListBase *t
                                /* othogonal to "new Y" "old Z! plane */
                                cross_v3_v3v3(orth, vec, zz);
                                normalize_v3(orth);
-
+                               
                                /* new X */
                                negate_v3_v3(totmat[0], orth);
-
+                               
                                /* we decided to keep Z */
                                cross_v3_v3v3(zz, orth, vec);
                                normalize_v3_v3(totmat[2], zz);
                                break;
                } /* switch (data->plane) */
-
+               
                mul_m4_m3m4(cob->matrix, totmat, cob->matrix);
        }
 }
@@ -4777,7 +4777,7 @@ void solve_constraints(ListBase *conlist, bConstraintOb *cob, float ctime)
                 *    since some constraints may not convert the solution back to the input space before blending
                 *    but all are guaranteed to end up in good "worldspace" result
                 */
-               /* Note: all kind of stuff here before (caused trouble), much easier to just interpolate, or did I miss something? -jahka */
+               /* Note: all kind of stuff here before (caused trouble), much easier to just interpolate, or did I miss something? -jahka (r.32105) */
                if (enf < 1.0f) {
                        float solution[4][4];
                        copy_m4_m4(solution, cob->matrix);
index dcf214852e3dbff80cf8f7121cc193001038aaab..7b6b629ca82f47c76208e16da4ce4f7f333dc41d 100644 (file)
@@ -2417,7 +2417,7 @@ void RNA_def_constraint(BlenderRNA *brna)
        RNA_def_property_float_sdna(prop, NULL, "rot_error");
        RNA_def_property_clear_flag(prop, PROP_EDITABLE);
        RNA_def_property_ui_text(prop, "Rot error",
-                                "Amount of residual error in radiant for constraints that work on orientation");
+                                "Amount of residual error in radians for constraints that work on orientation");
 
        /* pointers */
        rna_def_constrainttarget(brna);