Merge branch 'master' into blender2.8

1 files changed, 14 insertions, 14 deletions

diff --git a/source/blender/blenkernel/intern/gpencil.c b/source/blender/blenkernel/intern/gpencil.c
index 2753a5adbaa..d0b7d433eb6 100644
--- a/source/blender/blenkernel/intern/gpencil.c
+++ b/source/blender/blenkernel/intern/gpencil.c
@@ -447,8 +447,8 @@ bGPdata *BKE_gpencil_data_addnew(Main *bmain, const char name[])
 /**
  * Populate stroke with point data from data buffers
  *
- * \param array Flat array of point data values. Each entry has GP_PRIM_DATABUF_SIZE values
- * \param mat   4x4 transform matrix to transform points into the right coordinate space
+ * \param array: Flat array of point data values. Each entry has GP_PRIM_DATABUF_SIZE values
+ * \param mat: 4x4 transform matrix to transform points into the right coordinate space
  */
 void BKE_gpencil_stroke_add_points(bGPDstroke *gps, const float *array, const int totpoints, const float mat[4][4])
 {
@@ -621,7 +621,7 @@ bGPDlayer *BKE_gpencil_layer_duplicate(const bGPDlayer *gpl_src)
  *
  * WARNING! This function will not handle ID user count!
  *
- * \param flag  Copying options (see BKE_library.h's LIB_ID_COPY_... flags for more).
+ * \param flag: Copying options (see BKE_library.h's LIB_ID_COPY_... flags for more).
  */
 void BKE_gpencil_copy_data(bGPdata *gpd_dst, const bGPdata *gpd_src, const int UNUSED(flag))
 {
@@ -1233,9 +1233,9 @@ void BKE_gpencil_dvert_ensure(bGPDstroke *gps)
 
 /**
  * Apply smooth to stroke point
- * \param gps              Stroke to smooth
- * \param i                Point index
- * \param inf              Amount of smoothing to apply
+ * \param gps: Stroke to smooth
+ * \param i: Point index
+ * \param inf: Amount of smoothing to apply
  */
 bool BKE_gpencil_smooth_stroke(bGPDstroke *gps, int i, float inf)
 {
@@ -1412,9 +1412,9 @@ bool BKE_gpencil_smooth_stroke_uv(bGPDstroke *gps, int point_index, float influe
  * Get range of selected frames in layer.
  * Always the active frame is considered as selected, so if no more selected the range
  * will be equal to the current active frame.
- * \param gpl              Layer
- * \param r_initframe      Number of first selected frame
- * \param r_endframe       Number of last selected frame
+ * \param gpl: Layer
+ * \param r_initframe: Number of first selected frame
+ * \param r_endframe: Number of last selected frame
  */
 void BKE_gpencil_get_range_selected(bGPDlayer *gpl, int *r_initframe, int *r_endframe)
 {
@@ -1435,11 +1435,11 @@ void BKE_gpencil_get_range_selected(bGPDlayer *gpl, int *r_initframe, int *r_end
 
 /**
  * Get Falloff factor base on frame range
- * \param gpf          Frame
- * \param actnum       Number of active frame in layer
- * \param f_init       Number of first selected frame
- * \param f_end        Number of last selected frame
- * \param cur_falloff  Curve with falloff factors
+ * \param gpf: Frame
+ * \param actnum: Number of active frame in layer
+ * \param f_init: Number of first selected frame
+ * \param f_end: Number of last selected frame
+ * \param cur_falloff: Curve with falloff factors
  */
 float BKE_gpencil_multiframe_falloff_calc(bGPDframe *gpf, int actnum, int f_init, int f_end, CurveMapping *cur_falloff)
 {