diff options
| author | Martin Poirier <theeth@yahoo.com> | 2009-06-20 07:38:34 +0400 |
|---|---|---|
| committer | Martin Poirier <theeth@yahoo.com> | 2009-06-20 07:38:34 +0400 |
| commit | 12bf10be020de1f4031889f78552c77121da3194 (patch) | |
| tree | df916ba35e2e711f788d5792097f071c9e5023df /source/blender/blenkernel/BKE_action.h | |
| parent | bb9323a720483b0c02bf25ecfca9c6ccc8699519 (diff) | |
| parent | 7785ead4eb64f9702d7a59060e73b3e121e674a7 (diff) | |
2.5 merged 20773:21020
Diffstat (limited to 'source/blender/blenkernel/BKE_action.h')
| -rw-r--r-- | source/blender/blenkernel/BKE_action.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/blenkernel/BKE_action.h b/source/blender/blenkernel/BKE_action.h index cc10a4071a6..1fb200b94a8 100644 --- a/source/blender/blenkernel/BKE_action.h +++ b/source/blender/blenkernel/BKE_action.h @@ -140,7 +140,7 @@ void framechange_poses_clear_unkeyed(void); void what_does_obaction(struct Scene *scene, struct Object *ob, struct Object *workob, struct bPose *pose, struct bAction *act, char groupname[], float cframe); /* exported for game engine */ -void blend_poses(struct bPose *dst, struct bPose *src, float srcweight, short mode); +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); /* for proxy */ |