Merge branch 'master' into blender2.8

1 files changed, 3 insertions, 3 deletions

diff --git a/source/blender/blenkernel/intern/mesh_merge.c b/source/blender/blenkernel/intern/mesh_merge.c
index 5324c397ebf..b88fd5d2a21 100644
--- a/source/blender/blenkernel/intern/mesh_merge.c
+++ b/source/blender/blenkernel/intern/mesh_merge.c
@@ -219,15 +219,15 @@ static bool poly_gset_compare_fn(const void *k1, const void *k2)
  *
  * This frees the given mesh and returns a new mesh.
  *
- * \param vtargetmap  The table that maps vertices to target vertices.  a value of -1
+ * \param vtargetmap: The table that maps vertices to target vertices.  a value of -1
  * indicates a vertex is a target, and is to be kept.
  * This array is aligned with 'mesh->totvert'
  * \warning \a vtargetmap must **not** contain any chained mapping (v1 -> v2 -> v3 etc.), this is not supported
  * and will likely generate corrupted geometry.
  *
- * \param tot_vtargetmap  The number of non '-1' values in vtargetmap. (not the size)
+ * \param tot_vtargetmap: The number of non '-1' values in vtargetmap. (not the size)
  *
- * \param merge_mode enum with two modes.
+ * \param merge_mode: enum with two modes.
  * - #MESH_MERGE_VERTS_DUMP_IF_MAPPED
  * When called by the Mirror Modifier,
  * In this mode it skips any faces that have all vertices merged (to avoid creating pairs