style cleanup: spelling.

also remove large, duplicate comments from sunsky.h

8 files changed, 14 insertions, 15 deletions

diff --git a/source/blender/bmesh/intern/bmesh_construct.c b/source/blender/bmesh/intern/bmesh_construct.c
index 9a7524ba73b..f58c1141561 100644
--- a/source/blender/bmesh/intern/bmesh_construct.c
+++ b/source/blender/bmesh/intern/bmesh_construct.c
@@ -667,7 +667,7 @@ BMesh *BM_mesh_copy(BMesh *bm_old)
 		f2 = BM_face_create_ngon(bm_new, v, v2, edges, f->len, FALSE);
 		if (!f2)
 			continue;
-		/* use totface incase adding some faces fails */
+		/* use totface in case adding some faces fails */
 		BM_elem_index_set(f2, (bm_new->totface - 1)); /* set_inline */
 
 		ftable[i] = f2;
diff --git a/source/blender/bmesh/intern/bmesh_mods.c b/source/blender/bmesh/intern/bmesh_mods.c
index deed825aa0a..72f6814dc89 100644
--- a/source/blender/bmesh/intern/bmesh_mods.c
+++ b/source/blender/bmesh/intern/bmesh_mods.c
@@ -581,7 +581,7 @@ BMEdge *BM_vert_collapse_edge(BMesh *bm, BMEdge *ke, BMVert *kv,
 	/* Collapse between 2 edges */
 
 	/* in this case we want to keep all faces and not join them,
-	 * rather just get rid of the veretex - see bug [#28645] */
+	 * rather just get rid of the vertex - see bug [#28645] */
 	BMVert *tv  = bmesh_edge_other_vert_get(ke, kv);
 	if (tv) {
 		BMEdge *e2 = bmesh_disk_edge_next(ke, kv);
@@ -1073,7 +1073,7 @@ BMEdge *BM_edge_rotate(BMesh *bm, BMEdge *e, const short ccw, const short check_
 /**
  * \brief Rip a single face from a vertex fan
  */
-BMVert *BM_face_vert_rip(BMesh *bm, BMFace *sf, BMVert *sv)
+BMVert *BM_face_vert_separate(BMesh *bm, BMFace *sf, BMVert *sv)
 {
 	return bmesh_urmv(bm, sf, sv);
 }
@@ -1081,9 +1081,9 @@ BMVert *BM_face_vert_rip(BMesh *bm, BMFace *sf, BMVert *sv)
 /**
  * \brief Rip a single face from a vertex fan
  *
- * \note same as #BM_face_vert_rip but faster (avoids a loop lookup)
+ * \note same as #BM_face_vert_separate but faster (avoids a loop lookup)
  */
-BMVert *BM_face_loop_rip(BMesh *bm, BMLoop *sl)
+BMVert *BM_face_loop_separate(BMesh *bm, BMLoop *sl)
 {
 	return bmesh_urmv_loop(bm, sl);
 }
diff --git a/source/blender/bmesh/intern/bmesh_mods.h b/source/blender/bmesh/intern/bmesh_mods.h
index 994456f5917..f87cdcc02e2 100644
--- a/source/blender/bmesh/intern/bmesh_mods.h
+++ b/source/blender/bmesh/intern/bmesh_mods.h
@@ -77,7 +77,7 @@ enum {
 };
 
 
-BMVert *BM_face_vert_rip(BMesh *bm, BMFace *sf, BMVert *sv);
-BMVert *BM_face_loop_rip(BMesh *bm, BMLoop *sl);
+BMVert *BM_face_vert_separate(BMesh *bm, BMFace *sf, BMVert *sv);
+BMVert *BM_face_loop_separate(BMesh *bm, BMLoop *sl);
 
 #endif /* __BMESH_MODS_H__ */
diff --git a/source/blender/bmesh/intern/bmesh_opdefines.c b/source/blender/bmesh/intern/bmesh_opdefines.c
index 69e85fda002..97990c614d5 100644
--- a/source/blender/bmesh/intern/bmesh_opdefines.c
+++ b/source/blender/bmesh/intern/bmesh_opdefines.c
@@ -75,7 +75,7 @@
  * """
  *
  * so the first line is the "title" of the bmop.
- * subsequent line blocks seperated by blank lines
+ * subsequent line blocks separated by blank lines
  * are paragraphs.  individual descriptions of slots
  * would be extracted from comments
  * next to them, e.g.
diff --git a/source/blender/bmesh/intern/bmesh_polygon.c b/source/blender/bmesh/intern/bmesh_polygon.c
index a3c791a6af9..49a4df0fc9c 100644
--- a/source/blender/bmesh/intern/bmesh_polygon.c
+++ b/source/blender/bmesh/intern/bmesh_polygon.c
@@ -28,7 +28,7 @@
  * tessellation, etc)
  *
  * BMESH_TODO:
- *  - Add in Tesselator frontend that creates
+ *  - Add in Tessellator frontend that creates
  *    BMTriangles from copied faces
  *
  *  - Add in Function that checks for and flags
@@ -47,7 +47,7 @@
  * \brief TEST EDGE SIDE and POINT IN TRIANGLE
  *
  * Point in triangle tests stolen from scanfill.c.
- * Used for tesselator
+ * Used for tessellator
  */
 
 static short testedgesidef(const float v1[2], const float v2[2], const float v3[2])
@@ -700,12 +700,11 @@ static int goodline(float (*projectverts)[3], BMFace *f, int v1i,
 /**
  * \brief Find Ear
  *
- * Used by tesselator to find
+ * Used by tessellator to find
  * the next triangle to 'clip off'
  * of a polygon while tessellating.
  *
  * \param use_beauty Currently only applies to quads, can be extended later on.
- *
  */
 static BMLoop *find_ear(BMesh *UNUSED(bm), BMFace *f, float (*verts)[3], const int nvert, const int use_beauty)
 {
diff --git a/source/blender/bmesh/operators/bmo_bevel.c b/source/blender/bmesh/operators/bmo_bevel.c
index e055cd2306e..e881e1e277a 100644
--- a/source/blender/bmesh/operators/bmo_bevel.c
+++ b/source/blender/bmesh/operators/bmo_bevel.c
@@ -552,7 +552,7 @@ void bmo_bevel_exec(BMesh *bm, BMOperator *op)
 				/* set edge lengths of cross edges as the average of the cross edges they're based o */
 				if (has_elens) {
 					/* angle happens not to be used. why? - not sure it just isnt - campbell.
-					 * leave this in incase we need to use it later */
+					 * leave this in in case we need to use it later */
 #if 0
 					float ang;
 #endif
diff --git a/source/blender/bmesh/operators/bmo_extrude.c b/source/blender/bmesh/operators/bmo_extrude.c
index d62a22bcb8f..595502586b9 100644
--- a/source/blender/bmesh/operators/bmo_extrude.c
+++ b/source/blender/bmesh/operators/bmo_extrude.c
@@ -495,7 +495,7 @@ static void calc_solidify_normals(BMesh *bm)
 			}
 			else {
 				/* can't do anything useful here!
-				 * Set the face index for a vert incase it gets a zero normal */
+				 * Set the face index for a vert in case it gets a zero normal */
 				BM_elem_flag_disable(e->v1, BM_ELEM_TAG);
 				BM_elem_flag_disable(e->v2, BM_ELEM_TAG);
 				continue;
diff --git a/source/blender/bmesh/operators/bmo_mesh_conv.c b/source/blender/bmesh/operators/bmo_mesh_conv.c
index 1f83a54e8f3..16c1289f5fa 100644
--- a/source/blender/bmesh/operators/bmo_mesh_conv.c
+++ b/source/blender/bmesh/operators/bmo_mesh_conv.c
@@ -273,7 +273,7 @@ void bmo_mesh_to_bmesh_exec(BMesh *bm, BMOperator *op)
 			BM_elem_index_set(l, mpoly->loopstart + j); /* set_loop */
 		}
 
-		/* Copy Custom Dat */
+		/* Copy Custom Data */
 		CustomData_to_bmesh_block(&me->pdata, &bm->pdata, i, &f->head.data);
 	}