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.h | |
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.h')
-rw-r--r-- | source/blender/collada/collada_internal.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/source/blender/collada/collada_internal.h b/source/blender/collada/collada_internal.h index 4aa637a6876..482dbf9ab31 100644 --- a/source/blender/collada/collada_internal.h +++ b/source/blender/collada/collada_internal.h @@ -104,6 +104,7 @@ extern std::string get_geometry_id(Object *ob, bool use_instantiation); extern std::string get_light_id(Object *ob); extern std::string get_joint_id(Bone *bone, Object *ob_arm); +extern std::string get_joint_sid(Bone *bone, Object *ob_arm); extern std::string get_camera_id(Object *ob); |