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

1 files changed, 2 insertions, 2 deletions

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;