diff options
author | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2012-02-23 20:12:36 +0400 |
---|---|---|
committer | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2012-02-23 20:12:36 +0400 |
commit | fdc01b49c27141816a2b3148edf662c10d81b2a2 (patch) | |
tree | ae0d6c1e974ec6bb684c7972f14b1a917ffe18f3 | |
parent | 107795af496b7c78eef9f5cf1fb0f8589d7da834 (diff) |
Fix #30306: crash duplicating object with action actuator but no animation data.
-rw-r--r-- | source/blender/editors/object/object_add.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/editors/object/object_add.c b/source/blender/editors/object/object_add.c index 86fa01b44d3..27ed9f5b46e 100644 --- a/source/blender/editors/object/object_add.c +++ b/source/blender/editors/object/object_add.c @@ -1807,7 +1807,7 @@ static Base *object_add_duplicate_internal(Main *bmain, Scene *scene, Base *base for (act = obn->actuators.first; act; act = act->next) { if(act->type == ACT_ACTION) { bActionActuator* actact = (bActionActuator*) act->data; - if(actact->act == ob->adt->action) { + if(ob->adt && actact->act == ob->adt->action) { actact->act = obn->adt->action; } } |