From b36b9f15eaf6810d907e70fa111e47cf2449a31b Mon Sep 17 00:00:00 2001 From: Bastien Montagne Date: Tue, 12 Jun 2012 08:32:06 +0000 Subject: Few minors style and type fixes (and a nice, harmless copy/paste error! ;) ) --- source/blender/blenkernel/intern/anim_sys.c | 8 +++++--- source/blender/blenkernel/intern/constraint.c | 8 ++++---- 2 files changed, 9 insertions(+), 7 deletions(-) (limited to 'source/blender/blenkernel') diff --git a/source/blender/blenkernel/intern/anim_sys.c b/source/blender/blenkernel/intern/anim_sys.c index 7fc80529753..a0da23a8f8f 100644 --- a/source/blender/blenkernel/intern/anim_sys.c +++ b/source/blender/blenkernel/intern/anim_sys.c @@ -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); diff --git a/source/blender/blenkernel/intern/constraint.c b/source/blender/blenkernel/intern/constraint.c index 62fb791df3a..09351f36bdb 100644 --- a/source/blender/blenkernel/intern/constraint.c +++ b/source/blender/blenkernel/intern/constraint.c @@ -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); -- cgit v1.2.3