Revision: 16357
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=16357
Author: blendix
Date: 2008-09-04 02:16:34 +0200 (Thu, 04 Sep 2008)
Log Message:
-----------
Apricot Branch:
* Fix for wrong bone parent transform with duplis (multiplayer).
* Fix for crash on export when the bone in a bone parent relation
does not exist anymore.
Modified Paths:
--------------
branches/apricot/source/blender/blenkernel/intern/action.c
branches/apricot/source/gameengine/Converter/BL_BlenderDataConversion.cpp
Modified: branches/apricot/source/blender/blenkernel/intern/action.c
===================================================================
--- branches/apricot/source/blender/blenkernel/intern/action.c 2008-09-03
23:51:55 UTC (rev 16356)
+++ branches/apricot/source/blender/blenkernel/intern/action.c 2008-09-04
00:16:34 UTC (rev 16357)
@@ -348,6 +348,7 @@
VECCOPY(pchan->size, chan->size);
QUATCOPY(pchan->quat, chan->quat);
Mat4CpyMat4(pchan->chan_mat, (float(*)[4])chan->chan_mat);
+ Mat4CpyMat4(pchan->pose_mat, (float(*)[4])chan->pose_mat);
pchan->flag= chan->flag;
con= chan->constraints.first;
Modified:
branches/apricot/source/gameengine/Converter/BL_BlenderDataConversion.cpp
===================================================================
--- branches/apricot/source/gameengine/Converter/BL_BlenderDataConversion.cpp
2008-09-03 23:51:55 UTC (rev 16356)
+++ branches/apricot/source/gameengine/Converter/BL_BlenderDataConversion.cpp
2008-09-04 00:16:34 UTC (rev 16357)
@@ -2229,8 +2229,11 @@
{
// parent this to a bone
Bone *parent_bone =
get_named_bone(get_armature(blenderchild->parent), blenderchild->parsubstr);
- KX_BoneParentRelation *bone_parent_relation =
KX_BoneParentRelation::New(parent_bone);
-
pcit->m_gamechildnode->SetParentRelation(bone_parent_relation);
+
+ if(parent_bone) {
+ KX_BoneParentRelation
*bone_parent_relation = KX_BoneParentRelation::New(parent_bone);
+
pcit->m_gamechildnode->SetParentRelation(bone_parent_relation);
+ }
break;
}
_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
