diff options
author | Joshua Leung <aligorith@gmail.com> | 2009-10-09 16:16:58 +0400 |
---|---|---|
committer | Joshua Leung <aligorith@gmail.com> | 2009-10-09 16:16:58 +0400 |
commit | 9f7038c5a73d8e73b858a129561d4721481f62e2 (patch) | |
tree | 64ec765066f9935bab94656be7afc79ff39283a2 /source/blender/blenkernel | |
parent | 488c06d1827d5bf5d02a22fcc11a1dfeb50143a7 (diff) |
* Warning fixes for previous commit for Modifier renaming.
* Removed some old code (depsgraph) that was already commented out
Diffstat (limited to 'source/blender/blenkernel')
-rw-r--r-- | source/blender/blenkernel/intern/depsgraph.c | 25 | ||||
-rw-r--r-- | source/blender/blenkernel/intern/library.c | 3 |
2 files changed, 3 insertions, 25 deletions
diff --git a/source/blender/blenkernel/intern/depsgraph.c b/source/blender/blenkernel/intern/depsgraph.c index a8cec6070a0..ec054bc47cd 100644 --- a/source/blender/blenkernel/intern/depsgraph.c +++ b/source/blender/blenkernel/intern/depsgraph.c @@ -2391,29 +2391,6 @@ void DAG_pose_sort(Object *ob) ListBase targets = {NULL, NULL}; bConstraintTarget *ct; -#if 0 // XXX old animation system... driver stuff to watch out for - if(con->ipo) { - IpoCurve *icu; - for(icu= con->ipo->curve.first; icu; icu= icu->next) { - /* icu->driver->ob should actually point to ob->proxy if it - * is a proxy, but since it wasn't set correct it older - * files comparing with ob->proxy makes it work for those */ - if(icu->driver && (icu->driver->ob==ob || icu->driver->ob==ob->proxy)) { - bPoseChannel *target= get_pose_channel(ob->pose, icu->driver->name); - if(target) { - node2 = dag_get_node(dag, target); - dag_add_relation(dag, node2, node, 0, "Ipo Driver"); - - /* uncommented this line, results in dependencies - * not being added properly for this constraint, - * what is the purpose of this? - brecht */ - /*cti= NULL;*/ /* trick to get next loop skipped */ - } - } - } - } -#endif // XXX old animation system... driver stuff to watch out for - if (cti && cti->get_constraint_targets) { cti->get_constraint_targets(con, &targets); @@ -2423,7 +2400,7 @@ void DAG_pose_sort(Object *ob) if (target) { node2= dag_get_node(dag, target); dag_add_relation(dag, node2, node, 0, "IK Constraint"); - + if (con->type==CONSTRAINT_TYPE_KINEMATIC) { bKinematicConstraint *data = (bKinematicConstraint *)con->data; bPoseChannel *parchan; diff --git a/source/blender/blenkernel/intern/library.c b/source/blender/blenkernel/intern/library.c index 0f65be207d9..a79c3472426 100644 --- a/source/blender/blenkernel/intern/library.c +++ b/source/blender/blenkernel/intern/library.c @@ -1208,12 +1208,13 @@ static void lib_indirect_test_id(ID *id) int a; - // XXX old animation system! + // XXX old animation system! -------------------------------------- for (strip=ob->nlastrips.first; strip; strip=strip->next){ LIBTAG(strip->object); LIBTAG(strip->act); LIBTAG(strip->ipo); } + // XXX: new animation system needs something like this? for(a=0; a<ob->totcol; a++) { LIBTAG(ob->mat[a]); |