diff options
author | Campbell Barton <ideasman42@gmail.com> | 2010-02-18 14:49:17 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2010-02-18 14:49:17 +0300 |
commit | 8a3be9840315412e344bbd8554b3888399b72e6b (patch) | |
tree | e92bfbabc7a9798fd382a506f834e807fd6c4045 /source/blender | |
parent | 42fd22531f6d53dccdf3f21efb6b6bcc08c1b51b (diff) |
applying rest pose on a linked proxy would crash because object_data_is_libdata assumed proxy didnt have linked data.
Diffstat (limited to 'source/blender')
-rw-r--r-- | source/blender/blenkernel/intern/object.c | 4 |
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; |