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/animation | |
parent | 16fc62e15f0a749d6d64e784ea048e07d6ea3397 (diff) | |
parent | e757c4a3bec8b0e8d198531a28327332af00a9ba (diff) |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/editors/animation')
-rw-r--r-- | source/blender/editors/animation/anim_channels_edit.c | 4 | ||||
-rw-r--r-- | source/blender/editors/animation/anim_markers.c | 12 |
2 files changed, 8 insertions, 8 deletions
diff --git a/source/blender/editors/animation/anim_channels_edit.c b/source/blender/editors/animation/anim_channels_edit.c index 2dec9c251f5..84b59835750 100644 --- a/source/blender/editors/animation/anim_channels_edit.c +++ b/source/blender/editors/animation/anim_channels_edit.c @@ -850,8 +850,8 @@ static bool rearrange_island_bottom(ListBase *list, tReorderChannelIsland *islan /** * typedef for channel rearranging function * - * \param list List of tReorderChannelIsland's that channels belong to - * \param island Island to be moved + * \param list: List of tReorderChannelIsland's that channels belong to + * \param island: Island to be moved * \return Whether operation was a success */ typedef bool (*AnimChanRearrangeFp)(ListBase *list, tReorderChannelIsland *island); diff --git a/source/blender/editors/animation/anim_markers.c b/source/blender/editors/animation/anim_markers.c index 9144c0b3dcc..74169128e5a 100644 --- a/source/blender/editors/animation/anim_markers.c +++ b/source/blender/editors/animation/anim_markers.c @@ -127,12 +127,12 @@ ListBase *ED_animcontext_get_markers(const bAnimContext *ac) /** * Apply some transformation to markers after the fact * - * \param markers List of markers to affect - this may or may not be the scene markers list, so don't assume anything - * \param scene Current scene (for getting current frame) - * \param mode (TfmMode) transform mode that this transform is for - * \param value From the transform code, this is ``t->vec[0]`` + * \param markers: List of markers to affect - this may or may not be the scene markers list, so don't assume anything + * \param scene: Current scene (for getting current frame) + * \param mode: (TfmMode) transform mode that this transform is for + * \param value: From the transform code, this is ``t->vec[0]`` * (which is delta transform for grab/extend, and scale factor for scale) - * \param side (B/L/R) for 'extend' functionality, which side of current frame to use + * \param side: (B/L/R) for 'extend' functionality, which side of current frame to use */ int ED_markers_post_apply_transform(ListBase *markers, Scene *scene, int mode, float value, char side) { @@ -596,7 +596,7 @@ static bool ed_markers_poll_markers_exist(bContext *C) * "custom"/third-tier invoke() callback supplied as the last arg (which would normally * be the operator's invoke() callback elsewhere) * - * \param invoke_func "standard" invoke function that operator would otherwise have used. + * \param invoke_func: "standard" invoke function that operator would otherwise have used. * If NULL, the operator's standard exec() * callback will be called instead in the appropriate places. */ |