diff options
Diffstat (limited to 'source/blender/collada/ArmatureImporter.cpp')
| -rw-r--r-- | source/blender/collada/ArmatureImporter.cpp | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/source/blender/collada/ArmatureImporter.cpp b/source/blender/collada/ArmatureImporter.cpp index bccaf4eddf6..fd08e1ebfab 100644 --- a/source/blender/collada/ArmatureImporter.cpp +++ b/source/blender/collada/ArmatureImporter.cpp @@ -65,7 +65,7 @@ static EditBone *get_edit_bone(bArmature * armature, char *name) { ArmatureImporter::ArmatureImporter(UnitConverter *conv, MeshImporterBase *mesh, Scene *sce, const ImportSettings *import_settings) : - import_settings(import_settings), + import_settings(import_settings), unit_converter(conv), TransformReader(conv), scene(sce), @@ -255,9 +255,13 @@ void ArmatureImporter::connect_bone_chains(bArmature *armature, Bone *parentbone { BoneExtended *dominant_child = NULL; int maxlen = 0; - Bone *child = (Bone *)parentbone->childbase.first; - if (child && (import_settings->find_chains || child->next==NULL) ) - { + Bone *child; + + if (parentbone == NULL) + return; + + child = (Bone *)parentbone->childbase.first; + if (child && (import_settings->find_chains || child->next==NULL)) { for (; child; child = child->next) { BoneExtended *be = extended_bones[child->name]; if (be != NULL) { |