diff options
| author | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2013-07-04 00:37:09 +0400 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2013-07-04 00:37:09 +0400 |
| commit | bbfc3c6cee013f8a4458adcb120a462f641926e2 (patch) | |
| tree | 657e4e09d148c66896dd4a394a285d2c6b89e14c /source/blender | |
| parent | 42f6136da8d7325bdb8580d734566b6c8e578e2a (diff) | |
Fix #35992: crash using make links > animation data between empty and mesh object.
Diffstat (limited to 'source/blender')
| -rw-r--r-- | source/blender/editors/object/object_relations.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/source/blender/editors/object/object_relations.c b/source/blender/editors/object/object_relations.c index 59bbef1414b..75c1f956f1b 100644 --- a/source/blender/editors/object/object_relations.c +++ b/source/blender/editors/object/object_relations.c @@ -1476,11 +1476,13 @@ static int make_links_data_exec(bContext *C, wmOperator *op) break; case MAKE_LINKS_ANIMDATA: BKE_copy_animdata_id((ID *)ob_dst, (ID *)ob_src, FALSE); - if (obdata_id->lib) { - is_lib = true; - break; + if (ob_dst->data && ob_src->data) { + if (obdata_id->lib) { + is_lib = true; + break; + } + BKE_copy_animdata_id((ID *)ob_dst->data, (ID *)ob_src->data, FALSE); } - BKE_copy_animdata_id((ID *)ob_dst->data, (ID *)ob_src->data, FALSE); DAG_id_tag_update(&ob_dst->id, OB_RECALC_OB | OB_RECALC_DATA | OB_RECALC_TIME); break; case MAKE_LINKS_GROUP: |