From 5abe4313615dc17b999e150346f857313573a26d Mon Sep 17 00:00:00 2001 From: Juan Linietsky Date: Sat, 12 Dec 2015 14:55:16 -0300 Subject: [PATCH] better support for broken collada, fixes #2959 --- tools/collada/collada.cpp | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/tools/collada/collada.cpp b/tools/collada/collada.cpp index deec5f60c73..107ffac6269 100644 --- a/tools/collada/collada.cpp +++ b/tools/collada/collada.cpp @@ -1683,8 +1683,12 @@ Collada::Node* Collada::_parse_visual_scene_node(XMLParser& parser) { if ( parser.has_attribute("sid") ) { //bones may not have sid joint->sid=parser.get_attribute_value("sid"); // state.bone_map[joint->sid]=joint; - } else if (state.idref_joints.has(name)) + } else if (state.idref_joints.has(name)) { joint->sid=name; //kind of a cheat but.. + } else if (parser.has_attribute("name")) { + joint->sid=parser.get_attribute_value_safe("name"); + } + if (joint->sid!="") { state.sid_to_node_map[joint->sid]=id;