diff options
| author | Gaia Clary <gaia.clary@machinimatrix.org> | 2018-03-17 16:24:06 +0300 |
|---|---|---|
| committer | Gaia Clary <gaia.clary@machinimatrix.org> | 2018-03-17 16:24:06 +0300 |
| commit | 9ed7093aa639f31e9ba5b146d2d88bae942ab424 (patch) | |
| tree | 3ec4d0be0cabd2a43c8d4b33fd98f8eb190382a1 /source/blender/collada/AnimationExporter.cpp | |
| parent | dc08df659eaadd6c59c89f268aad9cd103e1e7e5 (diff) | |
| parent | 64fbd50e4cc23dfb6f8ab5014e1e924136522079 (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/collada/AnimationExporter.cpp')
| -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 53c1afd173f..1df0705c855 100644 --- a/source/blender/collada/AnimationExporter.cpp +++ b/source/blender/collada/AnimationExporter.cpp @@ -772,7 +772,7 @@ void AnimationExporter::dae_baked_animation(std::vector<float> &fra, Object *ob_ addSampler(sampler); - std::string target = get_joint_id(bone, ob_arm) + "/transform"; + std::string target = get_joint_id(ob_arm, bone) + "/transform"; addChannel(COLLADABU::URI(empty, sampler_id), target); closeAnimation(); |