From 2c4fb98522d152c7ec8e973a72bdbacff95158a3 Mon Sep 17 00:00:00 2001 From: Joshua Leung Date: Wed, 16 Feb 2011 21:54:41 +0000 Subject: 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. --- source/blender/editors/object/object_add.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) (limited to 'source/blender/editors/object') 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; -- cgit v1.2.3