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/collada_internal.cpp | |
| parent | dc08df659eaadd6c59c89f268aad9cd103e1e7e5 (diff) | |
| parent | 64fbd50e4cc23dfb6f8ab5014e1e924136522079 (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/collada/collada_internal.cpp')
| -rw-r--r-- | source/blender/collada/collada_internal.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/source/blender/collada/collada_internal.cpp b/source/blender/collada/collada_internal.cpp index 6ebde6bd773..cf4dcb5eb42 100644 --- a/source/blender/collada/collada_internal.cpp +++ b/source/blender/collada/collada_internal.cpp @@ -327,12 +327,12 @@ std::string get_light_id(Object *ob) return translate_id(id_name(ob)) + "-light"; } -std::string get_joint_id(Bone *bone, Object *ob_arm) +std::string get_joint_id(Object *ob, Bone *bone) { - return translate_id(id_name(ob_arm) + "_" + bone->name); + return translate_id(id_name(ob) + "_" + bone->name); } -std::string get_joint_sid(Bone *bone, Object *ob_arm) +std::string get_joint_sid(Bone *bone) { return translate_id(bone->name); } |