Merge branch 'master' into blender2.8

3 files changed, 24 insertions, 24 deletions

diff --git a/source/blender/bmesh/operators/bmo_fill_grid.c b/source/blender/bmesh/operators/bmo_fill_grid.c
index dc4ebf50754..a20555cf0c0 100644
--- a/source/blender/bmesh/operators/bmo_fill_grid.c
+++ b/source/blender/bmesh/operators/bmo_fill_grid.c
@@ -216,7 +216,7 @@ static void barycentric_weights_v2_grid_cache(
 /**
  * This may be useful outside the bmesh operator.
  *
- * \param v_grid  2d array of verts, all boundary verts must be set, we fill in the middle.
+ * \param v_grid: 2d array of verts, all boundary verts must be set, we fill in the middle.
  */
 static void bm_grid_fill_array(
         BMesh *bm, BMVert **v_grid, const uint xtot, unsigned const int ytot,
diff --git a/source/blender/bmesh/operators/bmo_normals.c b/source/blender/bmesh/operators/bmo_normals.c
index 73dbee25be3..78094d3279c 100644
--- a/source/blender/bmesh/operators/bmo_normals.c
+++ b/source/blender/bmesh/operators/bmo_normals.c
@@ -191,10 +191,10 @@ static int recalc_face_normals_find_index(BMesh *bm, BMFace **faces, const int f
  * Given an array of faces, recalculate their normals.
  * this functions assumes all faces in the array are connected by edges.
  *
- * \param bm
- * \param faces  Array of connected faces.
- * \param faces_len  Length of \a faces
- * \param oflag  Flag to check before doing the actual face flipping.
+ * \param bm:
+ * \param faces: Array of connected faces.
+ * \param faces_len: Length of \a faces
+ * \param oflag: Flag to check before doing the actual face flipping.
  */
 static void bmo_recalc_face_normals_array(BMesh *bm, BMFace **faces, const int faces_len, const short oflag)
 {
diff --git a/source/blender/bmesh/operators/bmo_primitive.c b/source/blender/bmesh/operators/bmo_primitive.c
index fd9b88ca4d3..dee61440bc9 100644
--- a/source/blender/bmesh/operators/bmo_primitive.c
+++ b/source/blender/bmesh/operators/bmo_primitive.c
@@ -823,10 +823,10 @@ void bmo_create_grid_exec(BMesh *bm, BMOperator *op)
 /**
  * Fills first available UVmap with grid-like UVs for all faces OpFlag-ged by given flag.
  *
- * \param bm The BMesh to operate on
- * \param x_segments The x-resolution of the grid
- * \param y_segments The y-resolution of the grid
- * \param oflag The flag to check faces with.
+ * \param bm: The BMesh to operate on
+ * \param x_segments: The x-resolution of the grid
+ * \param y_segments: The y-resolution of the grid
+ * \param oflag: The flag to check faces with.
  */
 void BM_mesh_calc_uvs_grid(
         BMesh *bm, const uint x_segments, const uint y_segments,
@@ -1159,8 +1159,8 @@ static void bm_mesh_calc_uvs_sphere_face(BMFace *f, const int cd_loop_uv_offset)
 /**
  * Fills first available UVmap with spherical projected UVs for all faces OpFlag-ged by given flag.
  *
- * \param bm The BMesh to operate on
- * \param oflag The flag to check faces with.
+ * \param bm: The BMesh to operate on
+ * \param oflag: The flag to check faces with.
  */
 void BM_mesh_calc_uvs_sphere(
         BMesh *bm,
@@ -1365,10 +1365,10 @@ void bmo_create_circle_exec(BMesh *bm, BMOperator *op)
 /**
  * Fills first available UVmap with 2D projected UVs for all faces OpFlag-ged by given flag.
  *
- * \param bm The BMesh to operate on.
- * \param mat The transform matrix applied to the created circle.
- * \param radius The size of the circle.
- * \param oflag The flag to check faces with.
+ * \param bm: The BMesh to operate on.
+ * \param mat: The transform matrix applied to the created circle.
+ * \param radius: The size of the circle.
+ * \param oflag: The flag to check faces with.
  */
 void BM_mesh_calc_uvs_circle(
         BMesh *bm, float mat[4][4], const float radius,
@@ -1530,13 +1530,13 @@ void bmo_create_cone_exec(BMesh *bm, BMOperator *op)
 /**
  * Fills first available UVmap with cylinder/cone-like UVs for all faces OpFlag-ged by given flag.
  *
- * \param bm The BMesh to operate on.
- * \param mat The transform matrix applied to the created cone/cylinder.
- * \param radius_top The size of the top end of the cone/cylinder.
- * \param radius_bottom The size of the bottom end of the cone/cylinder.
- * \param segments The number of subdivisions in the sides of the cone/cylinder.
- * \param cap_ends Whether the ends of the cone/cylinder are filled or not.
- * \param oflag The flag to check faces with.
+ * \param bm: The BMesh to operate on.
+ * \param mat: The transform matrix applied to the created cone/cylinder.
+ * \param radius_top: The size of the top end of the cone/cylinder.
+ * \param radius_bottom: The size of the bottom end of the cone/cylinder.
+ * \param segments: The number of subdivisions in the sides of the cone/cylinder.
+ * \param cap_ends: Whether the ends of the cone/cylinder are filled or not.
+ * \param oflag: The flag to check faces with.
  */
 void BM_mesh_calc_uvs_cone(
         BMesh *bm, float mat[4][4],
@@ -1696,8 +1696,8 @@ void bmo_create_cube_exec(BMesh *bm, BMOperator *op)
  * \note Expects tagged faces to be six quads.
  * \note Caller must order faces for correct alignment.
  *
- * \param bm The BMesh to operate on.
- * \param oflag The flag to check faces with.
+ * \param bm: The BMesh to operate on.
+ * \param oflag: The flag to check faces with.
  */
 void BM_mesh_calc_uvs_cube(BMesh *bm, const short oflag)
 {