diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2018-12-12 04:55:20 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2018-12-12 05:02:09 +0300 |
| commit | 49490e5cfbeb2b0b823aa2042401891001870a6e (patch) | |
| tree | a1d32562af2dea0c336ebd3d017a387834e936cc /source/blender/editors/armature | |
| parent | 16fc62e15f0a749d6d64e784ea048e07d6ea3397 (diff) | |
| parent | e757c4a3bec8b0e8d198531a28327332af00a9ba (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/editors/armature')
| -rw-r--r-- | source/blender/editors/armature/armature_utils.c | 4 | ||||
| -rw-r--r-- | source/blender/editors/armature/pose_transform.c | 8 |
2 files changed, 6 insertions, 6 deletions
diff --git a/source/blender/editors/armature/armature_utils.c b/source/blender/editors/armature/armature_utils.c index 53b07c59973..275d00ded58 100644 --- a/source/blender/editors/armature/armature_utils.c +++ b/source/blender/editors/armature/armature_utils.c @@ -181,8 +181,8 @@ bool ED_armature_ebone_is_child_recursive(EditBone *ebone_parent, EditBone *ebon /** * Finds the first parent shared by \a ebone_child * - * \param ebone_child Children bones to search - * \param ebone_child_tot Size of the ebone_child array + * \param ebone_child: Children bones to search + * \param ebone_child_tot: Size of the ebone_child array * \return The shared parent or NULL. */ EditBone *ED_armature_ebone_find_shared_parent(EditBone *ebone_child[], const unsigned int ebone_child_tot) diff --git a/source/blender/editors/armature/pose_transform.c b/source/blender/editors/armature/pose_transform.c index 18a9b546e83..ffbe8b52137 100644 --- a/source/blender/editors/armature/pose_transform.c +++ b/source/blender/editors/armature/pose_transform.c @@ -311,10 +311,10 @@ static void set_pose_keys(Object *ob) /** * Perform paste pose, for a single bone. * - * \param ob Object where bone to paste to lives - * \param chan Bone that pose to paste comes from - * \param selOnly Only paste on selected bones - * \param flip Flip on x-axis + * \param ob: Object where bone to paste to lives + * \param chan: Bone that pose to paste comes from + * \param selOnly: Only paste on selected bones + * \param flip: Flip on x-axis * \return Whether the bone that we pasted to if we succeeded */ static bPoseChannel *pose_bone_do_paste(Object *ob, bPoseChannel *chan, const bool selOnly, const bool flip) |