[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [57975] trunk/blender/source/blender/ editors/object/object_relations.c: Fix #35992: crash using make links > animation data between empty and mesh object.

[Brecht Van Lommel]

Revision: 57975
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=57975
Author:   blendix
Date:     2013-07-03 20:37:09 +0000 (Wed, 03 Jul 2013)
Log Message:
-----------
Fix #35992: crash using make links > animation data between empty and mesh object.

Modified Paths:
--------------
    trunk/blender/source/blender/editors/object/object_relations.c

Modified: trunk/blender/source/blender/editors/object/object_relations.c
===================================================================
--- trunk/blender/source/blender/editors/object/object_relations.c	2013-07-03 20:37:07 UTC (rev 57974)
+++ trunk/blender/source/blender/editors/object/object_relations.c	2013-07-03 20:37:09 UTC (rev 57975)
@@ -1476,11 +1476,13 @@
 						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: