diff options
| author | Joerg Mueller <nexyon@gmail.com> | 2011-06-21 02:55:18 +0400 |
|---|---|---|
| committer | Joerg Mueller <nexyon@gmail.com> | 2011-06-21 02:55:18 +0400 |
| commit | 207911bdb3e5ba3e110cc7107186af988d2d10e8 (patch) | |
| tree | 88684071e2813d52f8dc700b593d7644b2be88c8 /source/blender/blenkernel/intern/action.c | |
| parent | adb81a0351c0854ee8529ae7a66ef9c907790ee5 (diff) | |
| parent | 768184753abb5a69e278bfe6207fe070b2e0ffc7 (diff) | |
Merge with trunk r37677
Diffstat (limited to 'source/blender/blenkernel/intern/action.c')
| -rw-r--r-- | source/blender/blenkernel/intern/action.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/blenkernel/intern/action.c b/source/blender/blenkernel/intern/action.c index 21d9701004b..08eed6d61ba 100644 --- a/source/blender/blenkernel/intern/action.c +++ b/source/blender/blenkernel/intern/action.c @@ -1123,7 +1123,7 @@ void copy_pose_result(bPose *to, bPose *from) /* For the calculation of the effects of an Action at the given frame on an object * This is currently only used for the Action Constraint */ -void what_does_obaction (Scene *UNUSED(scene), Object *ob, Object *workob, bPose *pose, bAction *act, char groupname[], float cframe) +void what_does_obaction (Object *ob, Object *workob, bPose *pose, bAction *act, char groupname[], float cframe) { bActionGroup *agrp= action_groups_find_named(act, groupname); |