bartvdbraak/blender
1
0
Fork 4
Code Issues 4 Pull Requests 1 Actions 1 Packages Projects Releases Wiki Activity

fix a nullpointer exception when data missing in dae file

Browse Source
This commit is contained in:
Gaia Clary 2012-06-14 14:47:41 +00:00
parent 931aeeb1f2
commit 43864f9103
1 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -654,11 +654,17 @@ void ArmatureImporter::make_armatures(bContext *C)
create_armature_bones(skin);
// link armature with a mesh object
Object *ob = mesh_importer->get_object_by_geom_uid(*get_geometry_uid(skin.get_controller_uid()));
if (ob)
skin.link_armature(C, ob, joint_by_uid, this);
const COLLADAFW::UniqueId &uid = skin.get_controller_uid();
const COLLADAFW::UniqueId *guid = get_geometry_uid(uid);
if (guid != NULL) {
Object *ob = mesh_importer->get_object_by_geom_uid(*guid);
if (ob)
skin.link_armature(C, ob, joint_by_uid, this);
else
fprintf(stderr, "Cannot find object to link armature with.\n");
}
else
fprintf(stderr, "Cannot find object to link armature with.\n");
fprintf(stderr, "Cannot find geometry to link armature with.\n");
// set armature parent if any
Object *par = skin.get_parent();