diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2010-01-10 23:23:59 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2010-01-10 23:23:59 +0300 |
| commit | 0185e248619b883aa818d136ee1b8bd4bfa9f8ef (patch) | |
| tree | 86e0f20ae1be2f681735b2d21224b582f56610ba /source/blender/editors/object/object_relations.c | |
| parent | 6a15ac70b6558873dc15aa2172024477362fc33f (diff) | |
Make linked animdata working again, copies NLA too, as well as ObData animdata where types match
Diffstat (limited to 'source/blender/editors/object/object_relations.c')
| -rw-r--r-- | source/blender/editors/object/object_relations.c | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/source/blender/editors/object/object_relations.c b/source/blender/editors/object/object_relations.c index d4bf721e14e..237498f15fd 100644 --- a/source/blender/editors/object/object_relations.c +++ b/source/blender/editors/object/object_relations.c @@ -1219,14 +1219,8 @@ static int make_links_data_exec(bContext *C, wmOperator *op) } break; case MAKE_LINKS_ANIMDATA: -#if 0 // XXX old animation system - if(obt->ipo) obt->ipo->id.us--; - obt->ipo= ob->ipo; - if(obt->ipo) { - id_us_plus((ID *)obt->ipo); - do_ob_ipo(scene, obt); - } -#endif // XXX old animation system + BKE_copy_animdata_id((ID *)obt, (ID *)ob); + BKE_copy_animdata_id((ID *)obt->data, (ID *)ob->data); break; case MAKE_LINKS_DUPLIGROUP: if(ob->dup_group) ob->dup_group->id.us--; |