Merge branch 'master' into blender2.8

7 files changed, 15 insertions, 15 deletions

diff --git a/source/blender/bmesh/tools/bmesh_bisect_plane.c b/source/blender/bmesh/tools/bmesh_bisect_plane.c
index 4bf5526095f..13ff04b0e2e 100644
--- a/source/blender/bmesh/tools/bmesh_bisect_plane.c
+++ b/source/blender/bmesh/tools/bmesh_bisect_plane.c
@@ -302,9 +302,9 @@ finally:
 /* Main logic */
 
 /**
- * \param use_snap_center  Snap verts onto the plane.
- * \param use_tag  Only bisect tagged edges and faces.
- * \param oflag_center  Operator flag, enabled for geometry on the axis (existing and created)
+ * \param use_snap_center: Snap verts onto the plane.
+ * \param use_tag: Only bisect tagged edges and faces.
+ * \param oflag_center: Operator flag, enabled for geometry on the axis (existing and created)
  */
 void BM_mesh_bisect_plane(
         BMesh *bm, const float plane[4],
diff --git a/source/blender/bmesh/tools/bmesh_decimate_collapse.c b/source/blender/bmesh/tools/bmesh_decimate_collapse.c
index fa427b3b9eb..d0b52b9ae82 100644
--- a/source/blender/bmesh/tools/bmesh_decimate_collapse.c
+++ b/source/blender/bmesh/tools/bmesh_decimate_collapse.c
@@ -84,7 +84,7 @@ typedef enum CD_UseFlag {
  * ********************** */
 
 /**
- * \param vquadrics must be calloc'd
+ * \param vquadrics: must be calloc'd
  */
 static void bm_decim_build_quadrics(BMesh *bm, Quadric *vquadrics)
 {
@@ -1281,9 +1281,9 @@ static bool bm_decim_edge_collapse(
 
 /**
  * \brief BM_mesh_decimate
- * \param bm The mesh
- * \param factor face count multiplier [0 - 1]
- * \param vweights Optional array of vertex  aligned weights [0 - 1],
+ * \param bm: The mesh
+ * \param factor: face count multiplier [0 - 1]
+ * \param vweights: Optional array of vertex  aligned weights [0 - 1],
  *        a vertex group is the usual source for this.
  * \param symmetry_axis: Axis of symmetry, -1 to disable mirror decimate.
  * \param symmetry_eps: Threshold when matching mirror verts.
diff --git a/source/blender/bmesh/tools/bmesh_decimate_unsubdivide.c b/source/blender/bmesh/tools/bmesh_decimate_unsubdivide.c
index f0ac6c673c9..63000b1b4db 100644
--- a/source/blender/bmesh/tools/bmesh_decimate_unsubdivide.c
+++ b/source/blender/bmesh/tools/bmesh_decimate_unsubdivide.c
@@ -178,7 +178,7 @@ enum {
  */
 
 /**
- * \param tag_only so we can call this from an operator */
+ * \param tag_only: so we can call this from an operator */
 void BM_mesh_decimate_unsubdivide_ex(BMesh *bm, const int iterations, const bool tag_only)
 {
 #ifdef USE_WALKER
diff --git a/source/blender/bmesh/tools/bmesh_edgenet.c b/source/blender/bmesh/tools/bmesh_edgenet.c
index df9d07036af..acc9225424b 100644
--- a/source/blender/bmesh/tools/bmesh_edgenet.c
+++ b/source/blender/bmesh/tools/bmesh_edgenet.c
@@ -444,8 +444,8 @@ static LinkNode *bm_edgenet_path_calc_best(
  * \note New faces currently don't have their normals calculated and are flipped randomly.
  *       The caller needs to flip faces correctly.
  *
- * \param bm  The mesh to operate on.
- * \param use_edge_tag  Only fill tagged edges.
+ * \param bm: The mesh to operate on.
+ * \param use_edge_tag: Only fill tagged edges.
  */
 void BM_mesh_edgenet(
         BMesh *bm,
diff --git a/source/blender/bmesh/tools/bmesh_edgesplit.c b/source/blender/bmesh/tools/bmesh_edgesplit.c
index 3a844a0b8d9..b7494fd87bc 100644
--- a/source/blender/bmesh/tools/bmesh_edgesplit.c
+++ b/source/blender/bmesh/tools/bmesh_edgesplit.c
@@ -36,9 +36,9 @@
 #include "bmesh_edgesplit.h"  /* own include */
 
 /**
- * \param use_verts  Use flagged verts instead of edges.
- * \param tag_only  Only split tagged edges.
- * \param copy_select  Copy selection history.
+ * \param use_verts: Use flagged verts instead of edges.
+ * \param tag_only: Only split tagged edges.
+ * \param copy_select: Copy selection history.
  */
 void BM_mesh_edgesplit(
         BMesh *bm,
diff --git a/source/blender/bmesh/tools/bmesh_intersect.c b/source/blender/bmesh/tools/bmesh_intersect.c
index 1b37b7721b2..d3fdc7b5e10 100644
--- a/source/blender/bmesh/tools/bmesh_intersect.c
+++ b/source/blender/bmesh/tools/bmesh_intersect.c
@@ -971,7 +971,7 @@ static int isect_bvhtree_point_v3(
  * Intersect tessellated faces
  * leaving the resulting edges tagged.
  *
- * \param test_fn Return value: -1: skip, 0: tree_a, 1: tree_b (use_self == false)
+ * \param test_fn: Return value: -1: skip, 0: tree_a, 1: tree_b (use_self == false)
  * \param boolean_mode -1: no-boolean, 0: intersection... see #BMESH_ISECT_BOOLEAN_ISECT.
  * \return true if the mesh is changed (intersections cut or faces removed from boolean).
  */
diff --git a/source/blender/bmesh/tools/bmesh_region_match.c b/source/blender/bmesh/tools/bmesh_region_match.c
index e83ba73ad01..f75999386e1 100644
--- a/source/blender/bmesh/tools/bmesh_region_match.c
+++ b/source/blender/bmesh/tools/bmesh_region_match.c
@@ -1374,7 +1374,7 @@ static void bm_vert_fasthash_destroy(
 /**
  * Take a face-region and return a list of matching face-regions.
  *
- * \param faces_region  A single, contiguous face-region.
+ * \param faces_region: A single, contiguous face-region.
  * \return  A list of matching null-terminated face-region arrays.
  */
 int BM_mesh_region_match(