Merge branch 'master' into blender2.8

6 files changed, 7 insertions, 7 deletions

diff --git a/source/blender/bmesh/intern/bmesh_log.c b/source/blender/bmesh/intern/bmesh_log.c
index 732647f83a7..f0e82e6ae38 100644
--- a/source/blender/bmesh/intern/bmesh_log.c
+++ b/source/blender/bmesh/intern/bmesh_log.c
@@ -655,7 +655,7 @@ void BM_log_mesh_elems_reorder(BMesh *bm, BMLog *log)
 BMLogEntry *BM_log_entry_add(BMLog *log)
 {
 	/* WARNING: this is now handled by the UndoSystem: BKE_UNDOSYS_TYPE_SCULPT
-	 * freeing here causes unnecesssary complications. */
+	 * freeing here causes unnecessary complications. */
 	BMLogEntry *entry;
 #if 0
 	/* Delete any entries after the current one */
diff --git a/source/blender/bmesh/operators/bmo_primitive.c b/source/blender/bmesh/operators/bmo_primitive.c
index dee61440bc9..b4f41790a81 100644
--- a/source/blender/bmesh/operators/bmo_primitive.c
+++ b/source/blender/bmesh/operators/bmo_primitive.c
@@ -1099,7 +1099,7 @@ static void bm_mesh_calc_uvs_sphere_face(BMFace *f, const int cd_loop_uv_offset)
 	BLI_assert(f->len <= 4);
 
 	/* If face has 3 vertices, it's a polar face, in which case we need to
-	 * compute a nearbye to determine its latitude. */
+	 * compute a nearby to determine its latitude. */
 	float avgx = 0.0f, avgy = 0.0f;
 	BM_ITER_ELEM_INDEX (l, &iter, f, BM_LOOPS_OF_FACE, loop_index) {
 		if (f->len == 3) {
diff --git a/source/blender/bmesh/operators/bmo_subdivide_edgering.c b/source/blender/bmesh/operators/bmo_subdivide_edgering.c
index 251a79e8ff5..ade9b4ce8b7 100644
--- a/source/blender/bmesh/operators/bmo_subdivide_edgering.c
+++ b/source/blender/bmesh/operators/bmo_subdivide_edgering.c
@@ -34,7 +34,7 @@
  * - verts use BM_ELEM_TAG, these need to be cleared before functions exit.
  *
  * \note Order of execution with 2+ rings is undefined,
- * so tage care
+ * so take care.
  */
 
 #include "MEM_guardedalloc.h"
diff --git a/source/blender/bmesh/operators/bmo_triangulate.c b/source/blender/bmesh/operators/bmo_triangulate.c
index e686ef0429a..8b096e25746 100644
--- a/source/blender/bmesh/operators/bmo_triangulate.c
+++ b/source/blender/bmesh/operators/bmo_triangulate.c
@@ -267,7 +267,7 @@ void bmo_triangle_fill_exec(BMesh *bm, BMOperator *op)
 				}
 				else {
 					/* Edges with 1 or 3+ faces attached,
-					 * most likely caused by a degeneratge mesh. */
+					 * most likely caused by a degenerate mesh. */
 				}
 			}
 		}
diff --git a/source/blender/bmesh/tools/bmesh_bevel.c b/source/blender/bmesh/tools/bmesh_bevel.c
index ad576e61acb..8499db2fdb5 100644
--- a/source/blender/bmesh/tools/bmesh_bevel.c
+++ b/source/blender/bmesh/tools/bmesh_bevel.c
@@ -2194,7 +2194,7 @@ static void print_adjust_stats(BoundVert *vstart)
  * residual in terms of that one degree of freedom.
  * Unfortunately, the results are in some cases worse than the general least squares solution
  * for the combined (with weights) problem, so this code is not used.
- * But keep it here for a while in case peformance issues demand that it be used sometimes. */
+ * But keep it here for a while in case performance issues demand that it be used sometimes. */
 static bool adjust_the_cycle_or_chain_fast(BoundVert *vstart, int np, bool iscycle)
 {
 	BoundVert *v;
@@ -2423,7 +2423,7 @@ static void adjust_the_cycle_or_chain(BoundVert *vstart, bool iscycle)
 
 /* Adjust the offsets to try to make them, as much as possible,
  * have even-width bevels with offsets that match their specs.
- * The problem that we can try to amelieroate is that when loop slide
+ * The problem that we can try to ameliorate is that when loop slide
  * is active, the meet point will probably not be the one that makes
  * both sides have their specified width. And because both ends may be
  * on loop slide edges, the widths at each end could be different.
diff --git a/source/blender/bmesh/tools/bmesh_bisect_plane.c b/source/blender/bmesh/tools/bmesh_bisect_plane.c
index 13ff04b0e2e..b78deaa1d5f 100644
--- a/source/blender/bmesh/tools/bmesh_bisect_plane.c
+++ b/source/blender/bmesh/tools/bmesh_bisect_plane.c
@@ -26,7 +26,7 @@
  * Cut the geometry in half using a plane.
  *
  * \par Implementation
- * This simply works by splitting tagged edges whos verts span either side of
+ * This simply works by splitting tagged edges who's verts span either side of
  * the plane, then splitting faces along their dividing verts.
  * The only complex case is when a ngon spans the axis multiple times,
  * in this case we need to do some extra checks to correctly bisect the ngon.