diff options
author | Campbell Barton <ideasman42@gmail.com> | 2018-06-01 19:26:42 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2018-06-01 19:26:42 +0300 |
commit | bfe1d0e0dc6281d33448c3d4ddfa2e231bbc5566 (patch) | |
tree | 14e9db1c58d7ffc33becc3ff5d74f4feb4c2d75e /source/blender/blenkernel/intern/action.c | |
parent | 297bf7235bc4b2384b99f41676a8c217f2ee3249 (diff) | |
parent | 75fc1c35070e0cf247f2d2e4cffe8a6e711522ff (diff) |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/blenkernel/intern/action.c')
-rw-r--r-- | source/blender/blenkernel/intern/action.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/source/blender/blenkernel/intern/action.c b/source/blender/blenkernel/intern/action.c index c12dd49b47e..01f6eab261f 100644 --- a/source/blender/blenkernel/intern/action.c +++ b/source/blender/blenkernel/intern/action.c @@ -265,7 +265,7 @@ bActionGroup *action_groups_add_new(bAction *act, const char name[]) /* Add given channel into (active) group * - assumes that channel is not linked to anything anymore - * - always adds at the end of the group + * - always adds at the end of the group */ void action_groups_add_channel(bAction *act, bActionGroup *agrp, FCurve *fcurve) { @@ -914,7 +914,7 @@ void BKE_pose_channel_copy_data(bPoseChannel *pchan, const bPoseChannel *pchan_f /* checks for IK constraint, Spline IK, and also for Follow-Path constraint. - * can do more constraints flags later + * can do more constraints flags later */ /* pose should be entirely OK */ void BKE_pose_update_constraint_flags(bPose *pose) @@ -1388,7 +1388,7 @@ void BKE_pose_tag_recalc(Main *bmain, bPose *pose) } /* 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 + * This is currently only used for the Action Constraint */ void what_does_obaction(Object *ob, Object *workob, bPose *pose, bAction *act, char groupname[], float cframe) { |