diff options
| author | Joshua Leung <aligorith@gmail.com> | 2009-01-27 05:31:39 +0300 |
|---|---|---|
| committer | Joshua Leung <aligorith@gmail.com> | 2009-01-27 05:31:39 +0300 |
| commit | 8aabcdb883ebed9445df965f6866650ac39e1126 (patch) | |
| tree | a5f4944ee2db08831a3538e8d5c7406c8f528105 /source/blender/blenkernel | |
| parent | d17b0d738b389ae9602d3ae48b3206fb0542b610 (diff) | |
2.5 - Bugfixes for loading ManCandy
* Objects parented to bones now load correctly again (so Mancandy no longer looks like he had a run-in with a lawn mulcher). Was caused by a typo. I'm not sure how that got in there (or who did it)
* Action/Graph Editors would crash when loading files with Materials with some drivers.
Diffstat (limited to 'source/blender/blenkernel')
| -rw-r--r-- | source/blender/blenkernel/intern/object.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/blenkernel/intern/object.c b/source/blender/blenkernel/intern/object.c index 15fde4420f0..4332d789628 100644 --- a/source/blender/blenkernel/intern/object.c +++ b/source/blender/blenkernel/intern/object.c @@ -1617,7 +1617,7 @@ static void ob_parbone(Object *ob, Object *par, float mat[][4]) bPoseChannel *pchan; float vec[3]; - if (ob->type!=OB_ARMATURE) { + if (par->type!=OB_ARMATURE) { Mat4One(mat); return; } |