diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2017-07-18 06:09:36 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2017-07-18 06:09:36 +0300 |
| commit | 2475dbdc94d8ebc53e7285e69c9900b7989f1e1c (patch) | |
| tree | bfb875e9e88f284a8064c9883d223454d6877852 /source/blender/collada | |
| parent | f04c06498bd3bfc439cbcf35297a09112f8610b6 (diff) | |
| parent | 66383ea206d882fd8737c8e8da5355095e614bc8 (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/collada')
| -rw-r--r-- | source/blender/collada/AnimationExporter.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/collada/AnimationExporter.cpp b/source/blender/collada/AnimationExporter.cpp index 707aaea0b65..881662bd0b8 100644 --- a/source/blender/collada/AnimationExporter.cpp +++ b/source/blender/collada/AnimationExporter.cpp @@ -530,7 +530,7 @@ void AnimationExporter::dae_baked_animation(std::vector<float> &fra, Object *ob_ addSampler(sampler); - std::string target = translate_id(bone_name) + "/transform"; + std::string target = get_joint_id(bone, ob_arm) + "/transform"; addChannel(COLLADABU::URI(empty, sampler_id), target); closeAnimation(); |