summaryrefslogtreecommitdiff
path: root/tools
diff options
context:
space:
mode:
authorJuan Linietsky <reduzio@gmail.com>2015-12-12 14:55:16 -0300
committerJuan Linietsky <reduzio@gmail.com>2015-12-12 14:55:16 -0300
commit5abe4313615dc17b999e150346f857313573a26d (patch)
tree27cc1e206f462a0f88047ec85c43111122915c63 /tools
parent890b462ffbe6b3ece94b90170d95d719bc4a9075 (diff)
better support for broken collada, fixes #2959
Diffstat (limited to 'tools')
-rw-r--r--tools/collada/collada.cpp6
1 files changed, 5 insertions, 1 deletions
diff --git a/tools/collada/collada.cpp b/tools/collada/collada.cpp
index deec5f60c7..107ffac626 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;