diff options
| author | Mitchell Stokes <mogurijin@gmail.com> | 2011-06-29 06:42:46 +0400 |
|---|---|---|
| committer | Mitchell Stokes <mogurijin@gmail.com> | 2011-06-29 06:42:46 +0400 |
| commit | 3afe0e9c8803bd04daa7a8e0ae813796b455a4b4 (patch) | |
| tree | 6a864b18bb563e3c16828890e4c6a20a66a28bdb /source/gameengine/Converter/BL_ArmatureObject.h | |
| parent | d122f24c1af429dd59a0051db01650fd2b1abbba (diff) | |
BGE Animations: Beginning work on layer blending. Blending armature actions works, but needs more testing. Also, currently the mode is forced to ADD and the weight to 1.
Diffstat (limited to 'source/gameengine/Converter/BL_ArmatureObject.h')
| -rw-r--r-- | source/gameengine/Converter/BL_ArmatureObject.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/gameengine/Converter/BL_ArmatureObject.h b/source/gameengine/Converter/BL_ArmatureObject.h index 2c3ca7404b3..92a9a3685c9 100644 --- a/source/gameengine/Converter/BL_ArmatureObject.h +++ b/source/gameengine/Converter/BL_ArmatureObject.h @@ -145,7 +145,7 @@ protected: }; /* Pose function specific to the game engine */ -void game_blend_poses(struct bPose *dst, struct bPose *src, float srcweight/*, short mode*/); /* was blend_poses */ +void game_blend_poses(struct bPose *dst, struct bPose *src, float srcweight, short mode); /* was blend_poses */ //void extract_pose_from_pose(struct bPose *pose, const struct bPose *src); void game_copy_pose(struct bPose **dst, struct bPose *src, int copy_con); void game_free_pose(struct bPose *pose); |