diff options
| author | Joerg Mueller <nexyon@gmail.com> | 2011-06-21 02:55:18 +0400 |
|---|---|---|
| committer | Joerg Mueller <nexyon@gmail.com> | 2011-06-21 02:55:18 +0400 |
| commit | 207911bdb3e5ba3e110cc7107186af988d2d10e8 (patch) | |
| tree | 88684071e2813d52f8dc700b593d7644b2be88c8 /source/blender/collada/ArmatureImporter.cpp | |
| parent | adb81a0351c0854ee8529ae7a66ef9c907790ee5 (diff) | |
| parent | 768184753abb5a69e278bfe6207fe070b2e0ffc7 (diff) | |
Merge with trunk r37677
Diffstat (limited to 'source/blender/collada/ArmatureImporter.cpp')
| -rw-r--r-- | source/blender/collada/ArmatureImporter.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/source/blender/collada/ArmatureImporter.cpp b/source/blender/collada/ArmatureImporter.cpp index 262834d895b..48e0d99535b 100644 --- a/source/blender/collada/ArmatureImporter.cpp +++ b/source/blender/collada/ArmatureImporter.cpp @@ -42,12 +42,12 @@ #include "ArmatureImporter.h" -// use this for retrieving bone names, since these must be unique +// use node name, or fall back to original id if not present (name is optional) template<class T> static const char *bc_get_joint_name(T *node) { - const std::string& id = node->getOriginalId(); - return id.size() ? id.c_str() : node->getName().c_str(); + const std::string& id = node->getName(); + return id.size() ? id.c_str() : node->getOriginalId().c_str(); } ArmatureImporter::ArmatureImporter(UnitConverter *conv, MeshImporterBase *mesh, AnimationImporterBase *anim, Scene *sce) : |