Few minors style and type fixes (and a nice, harmless copy/paste error! ;) )
authorBastien Montagne <montagne29@wanadoo.fr>
Tue, 12 Jun 2012 08:32:06 +0000 (08:32 +0000)
committerBastien Montagne <montagne29@wanadoo.fr>
Tue, 12 Jun 2012 08:32:06 +0000 (08:32 +0000)
source/blender/blenkernel/intern/anim_sys.c
source/blender/blenkernel/intern/constraint.c

index 7fc805297533195b07a10ccb1f6ce8f18d471eb4..a0da23a8f8fcbbb0917450fdf44be8c971976f2f 100644 (file)
@@ -1287,9 +1287,11 @@ static void animsys_evaluate_drivers(PointerRNA *ptr, AnimData *adt, float ctime
                /* check if this driver's curve should be skipped */
                if ((fcu->flag & (FCURVE_MUTED | FCURVE_DISABLED)) == 0) {
                        /* check if driver itself is tagged for recalculation */
-                       if ((driver) && !(driver->flag & DRIVER_FLAG_INVALID) /*&& (driver->flag & DRIVER_FLAG_RECALC)*/) {  // XXX driver recalc flag is not set yet by depsgraph!
-                               /* evaluate this using values set already in other places */
-                               // NOTE: for 'layering' option later on, we should check if we should remove old value before adding new to only be done when drivers only changed
+                       /* XXX driver recalc flag is not set yet by depsgraph! */
+                       if ((driver) && !(driver->flag & DRIVER_FLAG_INVALID) /*&& (driver->flag & DRIVER_FLAG_RECALC)*/) {
+                               /* evaluate this using values set already in other places
+                                * NOTE: for 'layering' option later on, we should check if we should remove old value before adding
+                                *       new to only be done when drivers only changed */
                                calculate_fcurve(fcu, ctime);
                                ok = animsys_execute_fcurve(ptr, NULL, fcu);
                                
index 62fb791df3a4defdb7bf270c99b0a0a2f9dd49d3..09351f36bdb797bdb321ea368df76a9274dbc2d9 100644 (file)
@@ -822,12 +822,12 @@ static void childof_evaluate(bConstraint *con, bConstraintOb *cob, ListBase *tar
                if (data->flag == CHILDOF_ALL) {
                        
                        /* multiply target (parent matrix) by offset (parent inverse) to get 
-                        * the effect of the parent that will be exherted on the owner
+                        * the effect of the parent that will be exerted on the owner
                         */
                        mult_m4_m4m4(parmat, ct->matrix, data->invmat);
                        
                        /* now multiply the parent matrix by the owner matrix to get the 
-                        * the effect of this constraint (i.e.  owner is 'parented' to parent)
+                        * the effect of this constraint (i.e. owner is 'parented' to parent)
                         */
                        mult_m4_m4m4(cob->matrix, parmat, cob->matrix);
                }
@@ -864,7 +864,7 @@ static void childof_evaluate(bConstraint *con, bConstraintOb *cob, ListBase *tar
                        loc_eulO_size_to_mat4(invmat, loco, eulo, sizo, cob->rotOrder);
                        
                        /* multiply target (parent matrix) by offset (parent inverse) to get 
-                        * the effect of the parent that will be exherted on the owner
+                        * the effect of the parent that will be exerted on the owner
                         */
                        mult_m4_m4m4(parmat, ct->matrix, invmat);
                        
@@ -1620,7 +1620,7 @@ static void rotlike_new_data(void *cdata)
 
 static void rotlike_id_looper(bConstraint *con, ConstraintIDFunc func, void *userdata)
 {
-       bChildOfConstraint *data = con->data;
+       bRotateLikeConstraint *data = con->data;
        
        /* target only */
        func(con, (ID **)&data->tar, FALSE, userdata);