griefith/test2
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Fix part of #34746: crash importing certain collada files with armatures. It still

Browse Source 
imports the armature wrong though.
This commit is contained in:
Brecht Van Lommel
2013-04-22 15:49:15 +00:00
parent 150ce958b6
commit cd7fbf9749
1 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
source/blender/collada/SkinInfo.cpp
View File

@@ -316,12 +316,15 @@ void SkinInfo::find_root_joints(const std::vector<COLLADAFW::Node *> &root_joint
std::vector<JointData>::iterator ji;
//for each joint_data in this skin
for (ji = joint_data.begin(); ji != joint_data.end(); ji++) {
//get joint node from joint map
COLLADAFW::Node *joint = joint_by_uid[(*ji).joint_uid];
//find if joint node is in the tree belonging to the root_joint
if (find_node_in_tree(joint, root)) {
if (std::find(result.begin(), result.end(), root) == result.end())
result.push_back(root);
if (joint_by_uid.find((*ji).joint_uid) != joint_by_uid.end()) {
//get joint node from joint map
COLLADAFW::Node *joint = joint_by_uid[(*ji).joint_uid];
//find if joint node is in the tree belonging to the root_joint
if (find_node_in_tree(joint, root)) {
if (std::find(result.begin(), result.end(), root) == result.end())
result.push_back(root);
}
}
}
}