sandey/blender
1
0
Fork 0
forked from bartvdbraak/blender
Code Pull Requests Activity

fix T44648: Collada finding bone chains during import crashes when no bones are there

Browse Source
This commit is contained in:
Gaia Clary 2015-05-10 11:04:09 +02:00
parent 1fb97ffeed
commit 0525db39d1
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
source/blender/collada/ArmatureImporter.cpp
View File

@ -588,9 +588,11 @@ void ArmatureImporter::create_armature_bones(SkinInfo& skin)
/* and step back to edit mode to fix the leaf nodes */ /* and step back to edit mode to fix the leaf nodes */
ED_armature_to_edit(armature); ED_armature_to_edit(armature);
connect_bone_chains(armature, (Bone *)armature->bonebase.first, UNLIMITED_CHAIN_MAX); if (armature->bonebase.first) {
fix_leaf_bones(armature, (Bone *)armature->bonebase.first); /* Do this only if Armature has bones */
connect_bone_chains(armature, (Bone *)armature->bonebase.first, UNLIMITED_CHAIN_MAX);
fix_leaf_bones(armature, (Bone *)armature->bonebase.first);
}
// exit armature edit mode // exit armature edit mode
ED_armature_from_edit(armature); ED_armature_from_edit(armature);
ED_armature_edit_free(armature); ED_armature_edit_free(armature);