diff options
author | Joshua Leung <aligorith@gmail.com> | 2011-02-17 00:54:41 +0300 |
---|---|---|
committer | Joshua Leung <aligorith@gmail.com> | 2011-02-17 00:54:41 +0300 |
commit | 2c4fb98522d152c7ec8e973a72bdbacff95158a3 (patch) | |
tree | faa3e82ab51842c950eed22df0e5f0c1b8ccd473 /source/blender/editors/object/object_add.c | |
parent | 8ead7b327ce7c05be8e12a6dd0a663b00ba8ad16 (diff) |
Bugfix [#26106] No instant visual feed back for Dupliframes, parenting
problem and crash
- It turns out we still need the "copyob" still, if for nothing other
than making sure that the unkeyed transforms can get restored. This
was removed originally as I thought that just reevaluating the
animation would work.
- Removed a buggy line of logic that was causing crashes when there
was no animation data. It's better to just assume that if animation
data exists, that something exists there.
- Make Duplicates Real was not clearing data such as the new animation
data or constraints.
Diffstat (limited to 'source/blender/editors/object/object_add.c')
-rw-r--r-- | source/blender/editors/object/object_add.c | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/source/blender/editors/object/object_add.c b/source/blender/editors/object/object_add.c index 08a31923cda..99ba139a2d8 100644 --- a/source/blender/editors/object/object_add.c +++ b/source/blender/editors/object/object_add.c @@ -971,8 +971,13 @@ static void make_object_duplilist_real(bContext *C, Scene *scene, Base *base) basen->lay= base->lay; BLI_addhead(&scene->base, basen); /* addhead: othwise eternal loop */ basen->object= ob; - ob->ipo= NULL; /* make sure apply works */ - ob->parent= ob->track= NULL; + + /* make sure apply works */ + BKE_free_animdata(ob->adt); + ob->adt = NULL; + + ob->parent= NULL; + ob->constraints.first= ob->constraints.last= NULL; ob->disp.first= ob->disp.last= NULL; ob->transflag &= ~OB_DUPLI; ob->lay= base->lay; |