diff options
| author | Andre Susano Pinto <andresusanopinto@gmail.com> | 2009-10-06 05:58:22 +0400 |
|---|---|---|
| committer | Andre Susano Pinto <andresusanopinto@gmail.com> | 2009-10-06 05:58:22 +0400 |
| commit | 63a88075b574e8f2f9adc041f423f49a7356d736 (patch) | |
| tree | 951f1f65d74d052debdafa14f6ad22750b6aad04 /source/gameengine/Converter/BL_ArmatureObject.cpp | |
| parent | 11bdf6ea10ee7bc5e2862cdddbf42eddb06c42fa (diff) | |
| parent | 69a24325742c617a9902376b061006dfb24f0a3c (diff) | |
svn merge -r 23528:23646 https://svn.blender.org/svnroot/bf-blender/trunk/blendersoc-2009-jaguarandi
Diffstat (limited to 'source/gameengine/Converter/BL_ArmatureObject.cpp')
| -rw-r--r-- | source/gameengine/Converter/BL_ArmatureObject.cpp | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/source/gameengine/Converter/BL_ArmatureObject.cpp b/source/gameengine/Converter/BL_ArmatureObject.cpp index d5660d9ef84..a6066adc03e 100644 --- a/source/gameengine/Converter/BL_ArmatureObject.cpp +++ b/source/gameengine/Converter/BL_ArmatureObject.cpp @@ -152,7 +152,7 @@ void game_blend_poses(bPose *dst, bPose *src, float srcweight/*, short mode*/) for (dchan = (bPoseChannel*)dst->chanbase.first; dchan; dchan=(bPoseChannel*)dchan->next, schan= (bPoseChannel*)schan->next){ // always blend on all channels since we don't know which one has been set /* quat interpolation done separate */ - if (schan->rotmode == PCHAN_ROT_QUAT) { + if (schan->rotmode == ROT_MODE_QUAT) { float dquat[4], squat[4]; QUATCOPY(dquat, dchan->quat); @@ -590,6 +590,8 @@ float BL_ArmatureObject::GetBoneLength(Bone* bone) const return (float)(MT_Point3(bone->head) - MT_Point3(bone->tail)).length(); } +#ifndef DISABLE_PYTHON + // PYTHON PyTypeObject BL_ArmatureObject::Type = { @@ -654,3 +656,5 @@ KX_PYMETHODDEF_DOC_NOARGS(BL_ArmatureObject, update, SetActiveAction(NULL, 0, KX_GetActiveEngine()->GetFrameTime()); Py_RETURN_NONE; } + +#endif // DISABLE_PYTHON |