diff options
| author | Joseph Eagar <joeedh@gmail.com> | 2010-05-04 16:31:24 +0400 |
|---|---|---|
| committer | Joseph Eagar <joeedh@gmail.com> | 2010-05-04 16:31:24 +0400 |
| commit | a7cbd5008e830224e73e2e55f89d0783ded422e5 (patch) | |
| tree | 63f8d80c1db62e0a8f71db6d89de9d95e4b91fa0 /source/blender/blenloader/intern/readfile.c | |
| parent | cef3e3099a8d808474237e26cf373b3943897cb3 (diff) | |
merging revisions 28564-28569 from render branch into trunk
Diffstat (limited to 'source/blender/blenloader/intern/readfile.c')
| -rw-r--r-- | source/blender/blenloader/intern/readfile.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/source/blender/blenloader/intern/readfile.c b/source/blender/blenloader/intern/readfile.c index be19f7bfc18..fad679bc9f3 100644 --- a/source/blender/blenloader/intern/readfile.c +++ b/source/blender/blenloader/intern/readfile.c @@ -2221,6 +2221,12 @@ static void lib_link_pose(FileData *fd, Object *ob, bPose *pose) /* always rebuild to match proxy or lib changes */ rebuild= ob->proxy || (ob->id.lib==NULL && arm->id.lib); + if (ob->proxy && pose->proxy_act_bone[0]) { + Bone *bone = get_named_bone(arm, pose->proxy_act_bone); + if (bone) + arm->act_bone = bone; + } + for (pchan = pose->chanbase.first; pchan; pchan=pchan->next) { lib_link_constraints(fd, (ID *)ob, &pchan->constraints); @@ -11579,7 +11585,6 @@ static void expand_object(FileData *fd, Main *mainvar, Object *ob) PartEff *paf; int a; - expand_doit(fd, mainvar, ob->data); for (md=ob->modifiers.first; md; md=md->next) { |