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/gpencil | |
parent | 16fc62e15f0a749d6d64e784ea048e07d6ea3397 (diff) | |
parent | e757c4a3bec8b0e8d198531a28327332af00a9ba (diff) |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/editors/gpencil')
-rw-r--r-- | source/blender/editors/gpencil/editaction_gpencil.c | 2 | ||||
-rw-r--r-- | source/blender/editors/gpencil/gpencil_fill.c | 12 | ||||
-rw-r--r-- | source/blender/editors/gpencil/gpencil_intern.h | 4 | ||||
-rw-r--r-- | source/blender/editors/gpencil/gpencil_paint.c | 6 | ||||
-rw-r--r-- | source/blender/editors/gpencil/gpencil_utils.c | 10 |
5 files changed, 17 insertions, 17 deletions
diff --git a/source/blender/editors/gpencil/editaction_gpencil.c b/source/blender/editors/gpencil/editaction_gpencil.c index 57bba10fa50..335dc254f40 100644 --- a/source/blender/editors/gpencil/editaction_gpencil.c +++ b/source/blender/editors/gpencil/editaction_gpencil.c @@ -288,7 +288,7 @@ void ED_gplayer_frames_duplicate(bGPDlayer *gpl) } /* Set keyframe type for selected frames from given gp-layer - * \param type The type of keyframe (eBezTriple_KeyframeType) to set selected frames to + * \param type: The type of keyframe (eBezTriple_KeyframeType) to set selected frames to */ void ED_gplayer_frames_keytype_set(bGPDlayer *gpl, short type) { diff --git a/source/blender/editors/gpencil/gpencil_fill.c b/source/blender/editors/gpencil/gpencil_fill.c index 68f463dbce0..d0b581abaf2 100644 --- a/source/blender/editors/gpencil/gpencil_fill.c +++ b/source/blender/editors/gpencil/gpencil_fill.c @@ -394,11 +394,11 @@ static void set_pixel(ImBuf *ibuf, int idx, const float col[4]) * this is used for strokes with small gaps between them to get a full fill * and do not get a full screen fill. * - * \param ibuf Image pixel data - * \param maxpixel Maximum index - * \param limit Limit of pixels to analyze - * \param index Index of current pixel - * \param type 0-Horizontal 1-Vertical + * \param ibuf: Image pixel data + * \param maxpixel: Maximum index + * \param limit: Limit of pixels to analyze + * \param index: Index of current pixel + * \param type: 0-Horizontal 1-Vertical */ static bool is_leak_narrow(ImBuf *ibuf, const int maxpixel, int limit, int index, int type) { @@ -496,7 +496,7 @@ static bool is_leak_narrow(ImBuf *ibuf, const int maxpixel, int limit, int index * Fills the space created by a set of strokes using the stroke color as the boundary * of the shape to fill. * - * \param tgpf Temporary fill data + * \param tgpf: Temporary fill data */ static void gpencil_boundaryfill_area(tGPDfill *tgpf) { diff --git a/source/blender/editors/gpencil/gpencil_intern.h b/source/blender/editors/gpencil/gpencil_intern.h index 50ae61209cc..f9951c2561a 100644 --- a/source/blender/editors/gpencil/gpencil_intern.h +++ b/source/blender/editors/gpencil/gpencil_intern.h @@ -487,9 +487,9 @@ struct GP_EditableStrokes_Iter { * stopping on each usable layer + stroke pair (i.e. gpl and gps) * to perform some operations on the stroke. * - * \param gpl The identifier to use for the layer of the stroke being processed. + * \param gpl: The identifier to use for the layer of the stroke being processed. * Choose a suitable value to avoid name clashes. - * \param gps The identifier to use for current stroke being processed. + * \param gps: The identifier to use for current stroke being processed. * Choose a suitable value to avoid name clashes. */ #define GP_EDITABLE_STROKES_BEGIN(gpstroke_iter, C, gpl, gps) \ diff --git a/source/blender/editors/gpencil/gpencil_paint.c b/source/blender/editors/gpencil/gpencil_paint.c index be92f8ab74a..39bca4d096c 100644 --- a/source/blender/editors/gpencil/gpencil_paint.c +++ b/source/blender/editors/gpencil/gpencil_paint.c @@ -503,9 +503,9 @@ static void gp_brush_angle(bGPdata *gpd, Brush *brush, tGPspoint *pt, const floa * * A----B-----C------D * - * \param p Temp data - * \param inf Influence factor - * \param idx Index of the last point (need minimum 3 points in the array) + * \param p: Temp data + * \param inf: Influence factor + * \param idx: Index of the last point (need minimum 3 points in the array) */ static void gp_smooth_buffer(tGPsdata *p, float inf, int idx) { diff --git a/source/blender/editors/gpencil/gpencil_utils.c b/source/blender/editors/gpencil/gpencil_utils.c index 7aabe546ce6..7cc153e0f61 100644 --- a/source/blender/editors/gpencil/gpencil_utils.c +++ b/source/blender/editors/gpencil/gpencil_utils.c @@ -427,12 +427,12 @@ const EnumPropertyItem *ED_gpencil_layers_with_new_enum_itemf( /** * Check whether a given stroke segment is inside a circular brush * - * \param mval The current screen-space coordinates (midpoint) of the brush - * \param mvalo The previous screen-space coordinates (midpoint) of the brush (NOT CURRENTLY USED) - * \param rad The radius of the brush + * \param mval: The current screen-space coordinates (midpoint) of the brush + * \param mvalo: The previous screen-space coordinates (midpoint) of the brush (NOT CURRENTLY USED) + * \param rad: The radius of the brush * - * \param x0, y0 The screen-space x and y coordinates of the start of the stroke segment - * \param x1, y1 The screen-space x and y coordinates of the end of the stroke segment + * \param x0, y0: The screen-space x and y coordinates of the start of the stroke segment + * \param x1, y1: The screen-space x and y coordinates of the end of the stroke segment */ bool gp_stroke_inside_circle( const float mval[2], const float UNUSED(mvalo[2]), |