[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [27009] trunk/blender/source/blender/ blenkernel/intern/object.c: applying rest pose on a linked proxy would crash because object_data_is_libdata assumed proxy didnt have linked data .

[Campbell Barton]

Revision: 27009
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=27009
Author:   campbellbarton
Date:     2010-02-18 12:49:17 +0100 (Thu, 18 Feb 2010)

Log Message:
-----------
applying rest pose on a linked proxy would crash because object_data_is_libdata assumed proxy didnt have linked data.

Modified Paths:
--------------
    trunk/blender/source/blender/blenkernel/intern/object.c

Modified: trunk/blender/source/blender/blenkernel/intern/object.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/object.c	2010-02-18 11:00:44 UTC (rev 27008)
+++ trunk/blender/source/blender/blenkernel/intern/object.c	2010-02-18 11:49:17 UTC (rev 27009)
@@ -1436,9 +1436,9 @@
 int object_data_is_libdata(Object *ob)
 {
 	if(!ob) return 0;
-	if(ob->proxy) return 0;
+	if(ob->proxy && (ob->data==NULL || ((ID *)ob->data)->lib==NULL)) return 0;
 	if(ob->id.lib) return 1;
-	if(!ob->data) return 0;
+	if(ob->data==NULL) return 0;
 	if(((ID *)ob->data)->lib) return 1;
 
 	return 0;