Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrecht Van Lommel <brechtvanlommel@pandora.be>2012-02-23 20:12:36 +0400
committerBrecht Van Lommel <brechtvanlommel@pandora.be>2012-02-23 20:12:36 +0400
commitfdc01b49c27141816a2b3148edf662c10d81b2a2 (patch)
treeae0d6c1e974ec6bb684c7972f14b1a917ffe18f3 /source/blender/editors/object/object_add.c
parent107795af496b7c78eef9f5cf1fb0f8589d7da834 (diff)
Fix #30306: crash duplicating object with action actuator but no animation data.
Diffstat (limited to 'source/blender/editors/object/object_add.c')
-rw-r--r--source/blender/editors/object/object_add.c2
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;
}
}