diff options
| author | Nathan Letwory <nathan@letworyinteractive.com> | 2011-06-20 16:43:10 +0400 |
|---|---|---|
| committer | Nathan Letwory <nathan@letworyinteractive.com> | 2011-06-20 16:43:10 +0400 |
| commit | d27863733710ab23749b21755be245bc7a303f12 (patch) | |
| tree | 267f7098f2edc0a5df09c5383c278d4fca42593d /source/blender/collada/collada_internal.cpp | |
| parent | 81f5679ff50fde4085b92cb39f98efd8354fc5ef (diff) | |
Fix [#26912] [Collada] Screw up with names/ids on import
Reported by Valeriy Firsov
Use the node name if it exists, fall back to id otherwise.
Diffstat (limited to 'source/blender/collada/collada_internal.cpp')
| -rw-r--r-- | source/blender/collada/collada_internal.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/collada/collada_internal.cpp b/source/blender/collada/collada_internal.cpp index 4f4d16d3b0d..9cb6a227fc9 100644 --- a/source/blender/collada/collada_internal.cpp +++ b/source/blender/collada/collada_internal.cpp @@ -265,7 +265,7 @@ 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(bone->name); } std::string get_camera_id(Object *ob) |