diff options
author | Campbell Barton <ideasman42@gmail.com> | 2013-10-11 00:56:27 +0400 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2013-10-11 00:56:27 +0400 |
commit | 830974bc1e59c8e53c37c51f8bff0a0c34b245f7 (patch) | |
tree | 7746abc5ac91ba8099245c0cad384f0a2de923bd /source/gameengine | |
parent | cb6e795a47db6f86c6592480a0743eaae33900d4 (diff) |
fix [#37032] Blener crashes when parent to new object
Diffstat (limited to 'source/gameengine')
-rw-r--r-- | source/gameengine/Converter/BL_BlenderDataConversion.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/source/gameengine/Converter/BL_BlenderDataConversion.cpp b/source/gameengine/Converter/BL_BlenderDataConversion.cpp index dd9609968b0..b0555abbea4 100644 --- a/source/gameengine/Converter/BL_BlenderDataConversion.cpp +++ b/source/gameengine/Converter/BL_BlenderDataConversion.cpp @@ -2665,7 +2665,8 @@ void BL_ConvertBlenderObjects(struct Main* maggie, case PARBONE: { // parent this to a bone - Bone *parent_bone = BKE_armature_find_bone_name( (bArmature *)(blenderchild->parent)->data, blenderchild->parsubstr); + Bone *parent_bone = BKE_armature_find_bone_name(BKE_armature_from_object(blenderchild->parent), + blenderchild->parsubstr); if (parent_bone) { KX_BoneParentRelation *bone_parent_relation = KX_BoneParentRelation::New(parent_bone); |