diff options
| author | Jon Allee <> | 2017-03-14 16:17:04 +0300 |
|---|---|---|
| committer | Gaia Clary <gaia.clary@machinimatrix.org> | 2017-03-14 16:35:51 +0300 |
| commit | da6cd77628103fd4e95d13cf339420a15bad64ee (patch) | |
| tree | 41433774ec69f31175cd703dd33aa76220e3c894 /source/blender/collada/collada_internal.cpp | |
| parent | f3ff03b3c1a179ff4c9c979da5c53061447fefbc (diff) | |
fix D2552: Collada - use unique id for bones with same name but in different armatures. Co-authored-by: Gaia <gaia.clary@machiniamtrix.org>
Diffstat (limited to 'source/blender/collada/collada_internal.cpp')
| -rw-r--r-- | source/blender/collada/collada_internal.cpp | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/source/blender/collada/collada_internal.cpp b/source/blender/collada/collada_internal.cpp index e1a13559b08..70b44ebc222 100644 --- a/source/blender/collada/collada_internal.cpp +++ b/source/blender/collada/collada_internal.cpp @@ -341,7 +341,12 @@ std::string get_light_id(Object *ob) std::string get_joint_id(Bone *bone, Object *ob_arm) { - return translate_id(/*id_name(ob_arm) + "_" +*/ bone->name); + return translate_id(id_name(ob_arm) + "_" + bone->name); +} + +std::string get_joint_sid(Bone *bone, Object *ob_arm) +{ + return translate_id(bone->name); } std::string get_camera_id(Object *ob) |