diff options
| -rw-r--r-- | source/blender/blenkernel/intern/depsgraph.c | 25 | ||||
| -rw-r--r-- | source/blender/blenkernel/intern/library.c | 3 | ||||
| -rw-r--r-- | source/blender/blenloader/intern/readfile.c | 4 | ||||
| -rw-r--r-- | source/blender/editors/object/object_edit.c | 4 | ||||
| -rw-r--r-- | source/blender/editors/object/object_hook.c | 2 |
5 files changed, 8 insertions, 30 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]); diff --git a/source/blender/blenloader/intern/readfile.c b/source/blender/blenloader/intern/readfile.c index 49dae2af168..9b4ed4d11a7 100644 --- a/source/blender/blenloader/intern/readfile.c +++ b/source/blender/blenloader/intern/readfile.c @@ -4096,7 +4096,7 @@ static void direct_link_object(FileData *fd, Object *ob) BLI_addhead(&ob->modifiers, hmd); BLI_remlink(&ob->hooks, hook); - modifier_unique_name(&ob->modifiers, hmd); + modifier_unique_name(&ob->modifiers, (ModifierData*)hmd); MEM_freeN(hook); } @@ -7662,7 +7662,7 @@ static void do_versions(FileData *fd, Library *lib, Main *main) BLI_addtail(&ob->modifiers, smd); - modifier_unique_name(&ob->modifiers, smd); + modifier_unique_name(&ob->modifiers, (ModifierData*)smd); } } diff --git a/source/blender/editors/object/object_edit.c b/source/blender/editors/object/object_edit.c index 55f95f451d2..ac47556c7f7 100644 --- a/source/blender/editors/object/object_edit.c +++ b/source/blender/editors/object/object_edit.c @@ -848,7 +848,7 @@ void special_editmenu(Scene *scene, View3D *v3d) BooleanModifierData *bmd = NULL; bmd = (BooleanModifierData *)modifier_new(eModifierType_Boolean); BLI_addtail(&ob->modifiers, bmd); - modifier_unique_name(&ob->modifiers, bmd); + modifier_unique_name(&ob->modifiers, (ModifierData*)bmd); bmd->object = base_select->object; bmd->modifier.mode |= eModifierMode_Realtime; switch(nr){ @@ -981,7 +981,7 @@ static void object_flip_subdivison_particles(Scene *scene, Object *ob, int *set, SubsurfModifierData *smd = (SubsurfModifierData*) modifier_new(eModifierType_Subsurf); BLI_addtail(&ob->modifiers, smd); - modifier_unique_name(&ob->modifiers, smd); + modifier_unique_name(&ob->modifiers, (ModifierData*)smd); if (level!=-1) { smd->levels = level; diff --git a/source/blender/editors/object/object_hook.c b/source/blender/editors/object/object_hook.c index 63182e943bb..4643b875872 100644 --- a/source/blender/editors/object/object_hook.c +++ b/source/blender/editors/object/object_hook.c @@ -480,7 +480,7 @@ void add_hook(Scene *scene, View3D *v3d, int mode) hmd = (HookModifierData*) modifier_new(eModifierType_Hook); BLI_insertlinkbefore(&obedit->modifiers, md, hmd); sprintf(hmd->modifier.name, "Hook-%s", ob->id.name+2); - modifier_unique_name(&obedit->modifiers, hmd); + modifier_unique_name(&obedit->modifiers, (ModifierData*)hmd); } else if (hmd->indexar) MEM_freeN(hmd->indexar); /* reassign, hook was set */ |