From b429af10d04d727574eb50a7186e8075ae8fb0b8 Mon Sep 17 00:00:00 2001 From: Xiao Xiangquan Date: Fri, 24 Jun 2011 03:30:50 +0000 Subject: merge from trunk #37722 --- source/blender/collada/collada_internal.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'source/blender/collada/collada_internal.cpp') 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) -- cgit v1.2.3