From 8a3be9840315412e344bbd8554b3888399b72e6b Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Thu, 18 Feb 2010 11:49:17 +0000 Subject: applying rest pose on a linked proxy would crash because object_data_is_libdata assumed proxy didnt have linked data. --- source/blender/blenkernel/intern/object.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'source/blender') diff --git a/source/blender/blenkernel/intern/object.c b/source/blender/blenkernel/intern/object.c index 392e4210302..cb4c97f7eb7 100644 --- a/source/blender/blenkernel/intern/object.c +++ b/source/blender/blenkernel/intern/object.c @@ -1436,9 +1436,9 @@ int object_is_libdata(Object *ob) 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; -- cgit v1.2.3