style cleanup

- spelling - turns out we had tessellation spelt wrong all over.
- use \directive for doxy (not @directive)
- remove BLI_sparsemap.h - was from bmesh merge IIRC but entire file commented and not used.

16 files changed, 73 insertions, 73 deletions

diff --git a/source/blender/blenkernel/intern/DerivedMesh.c b/source/blender/blenkernel/intern/DerivedMesh.c
index 9d5b8a3b6a5..0d12785872c 100644
--- a/source/blender/blenkernel/intern/DerivedMesh.c
+++ b/source/blender/blenkernel/intern/DerivedMesh.c
@@ -360,7 +360,7 @@ void DM_ensure_tessface(DerivedMesh *dm)
 	const int numPolys =     dm->getNumPolys(dm);
 
 	if ( (numTessFaces == 0) && (numPolys != 0)) {
-		dm->recalcTesselation(dm);
+		dm->recalcTessellation(dm);
 
 		if (dm->getNumTessFaces(dm) != 0) {
 			/* printf("info %s: polys -> ngons calculated\n", __func__); */
@@ -1091,9 +1091,9 @@ void DM_update_weight_mcol(Object *ob, DerivedMesh *dm, int const draw_flag,
 			wtcol_v = calc_weightpaint_vert_array(ob, dm, draw_flag, coba);
 
 		/* Now copy colors in all face verts. */
-		/*first add colors to the tesselation faces*/
+		/*first add colors to the tessellation faces*/
 		/* XXX Why update that layer? We have to update WEIGHT_MLOOPCOL anyway, 
-		 *     and tesselation recreates mface layers from mloop/mpoly ones, so no
+		 *     and tessellation recreates mface layers from mloop/mpoly ones, so no
 		 *     need to fill WEIGHT_MCOL here. */
 #if 0
 		for (i = 0; i < numFaces; i++, mf++, wtcol_f_step += (4 * 4)) {
@@ -1661,7 +1661,7 @@ static void mesh_calc_modifiers(Scene *scene, Object *ob, float (*inputVertexCos
 		/* calculating normals can re-calculate tessfaces in some cases */
 		int num_tessface = finaldm->getNumTessFaces(finaldm);
 		/* --------------------------------------------------------------------- */
-		/* First calculate the polygon and vertex normals, re-tesselation
+		/* First calculate the polygon and vertex normals, re-tessellation
 		 * copies these into the tessface's normal layer */
 
 
@@ -1673,13 +1673,13 @@ static void mesh_calc_modifiers(Scene *scene, Object *ob, float (*inputVertexCos
 		finaldm->calcNormals(finaldm);
 #endif
 
-		/* Re-tesselation is necessary to push render data (uvs, textures, colors)
+		/* Re-tessellation is necessary to push render data (uvs, textures, colors)
 		 * from loops and polys onto the tessfaces. This may be currently be
-		 * redundantin cases where the render mode doesn't use these inputs, but
-		 * ideally eventually tesselation would happen on-demand, and this is one
+		 * redundant in cases where the render mode doesn't use these inputs, but
+		 * ideally eventually tessellation would happen on-demand, and this is one
 		 * of the primary places it would be needed. */
 		if (num_tessface == 0 && finaldm->getNumTessFaces(finaldm) == 0) {
-			finaldm->recalcTesselation(finaldm);
+			finaldm->recalcTessellation(finaldm);
 		}
 		/* Need to watch this, it can cause issues, see bug [#29338]             */
 		/* take care with this block, we really need testing frameworks          */
diff --git a/source/blender/blenkernel/intern/anim.c b/source/blender/blenkernel/intern/anim.c
index d0733166074..6f3facb6d9d 100644
--- a/source/blender/blenkernel/intern/anim.c
+++ b/source/blender/blenkernel/intern/anim.c
@@ -318,7 +318,7 @@ static void motionpaths_calc_update_scene(Scene *scene)
 	/* find the last object with the tag 
 	 *	- all those afterwards are assumed to not be relevant for our calculations
 	 */
-	// optimise further by moving out...
+	// optimize further by moving out...
 	for (base=scene->base.first; base; base=base->next) {
 		if (base->object->flag & BA_TEMP_TAG)
 			last = base;
@@ -416,7 +416,7 @@ void animviz_calc_motionpaths(Scene *scene, ListBase *targets)
 	}
 	if (efra <= sfra) return;
 	
-	/* optimise the depsgraph for faster updates */
+	/* optimize the depsgraph for faster updates */
 	// TODO: whether this is used should depend on some setting for the level of optimisations used
 	motionpaths_calc_optimise_depsgraph(scene, targets);
 	
diff --git a/source/blender/blenkernel/intern/anim_sys.c b/source/blender/blenkernel/intern/anim_sys.c
index ec92685b594..ea353fc9073 100644
--- a/source/blender/blenkernel/intern/anim_sys.c
+++ b/source/blender/blenkernel/intern/anim_sys.c
@@ -1176,7 +1176,7 @@ static short animsys_write_rna_setting (PointerRNA *ptr, char *path, int array_i
 			if (RNA_property_update_check(prop)) {
 				short skip_updates_hack = 0;
 				
-				/* optimisation hacks: skip property updates for those properties
+				/* optimization hacks: skip property updates for those properties
 				 * for we know that which the updates in RNA were really just for
 				 * flushing property editing via UI/Py
 				 */
@@ -1676,7 +1676,7 @@ static void nlaevalchan_buffers_accumulate (ListBase *channels, ListBase *tmp_bu
 {
 	NlaEvalChannel *nec, *necn, *necd;
 	
-	/* optimise - abort if no channels */
+	/* optimize - abort if no channels */
 	if (tmp_buffer->first == NULL)
 		return;
 	
@@ -2288,13 +2288,13 @@ void BKE_animsys_evaluate_all_animation (Main *main, Scene *scene, float ctime)
 		} \
 	}
 	
-	/* optimisation: 
+	/* optimization: 
 	 * when there are no actions, don't go over database and loop over heaps of datablocks, 
 	 * which should ultimately be empty, since it is not possible for now to have any animation 
 	 * without some actions, and drivers wouldn't get affected by any state changes
 	 *
 	 * however, if there are some curves, we will need to make sure that their 'ctime' property gets
-	 * set correctly, so this optimisation must be skipped in that case...
+	 * set correctly, so this optimization must be skipped in that case...
 	 */
 	if ((main->action.first == NULL) && (main->curve.first == NULL)) {
 		if (G.f & G_DEBUG)
@@ -2347,7 +2347,7 @@ void BKE_animsys_evaluate_all_animation (Main *main, Scene *scene, float ctime)
 
 	/* objects */
 		/* ADT_RECALC_ANIM doesn't need to be supplied here, since object AnimData gets 
-		 * this tagged by Depsgraph on framechange. This optimisation means that objects
+		 * this tagged by Depsgraph on framechange. This optimization means that objects
 		 * linked from other (not-visible) scenes will not need their data calculated.
 		 */
 	EVAL_ANIM_IDS(main->object.first, 0); 
diff --git a/source/blender/blenkernel/intern/bvhutils.c b/source/blender/blenkernel/intern/bvhutils.c
index f4416b8f5d6..0af3c9c9f02 100644
--- a/source/blender/blenkernel/intern/bvhutils.c
+++ b/source/blender/blenkernel/intern/bvhutils.c
@@ -595,7 +595,7 @@ BVHTree* bvhtree_from_mesh_faces(BVHTreeFromMesh *data, DerivedMesh *mesh, float
 
 					/* XXX, for snap only, em & dm are assumed to be aligned, since dm is the em's cage */
 
-					/*Insert BMesh-tesselation triangles into the bvh tree, unless they are hidden
+					/*Insert BMesh-tessellation triangles into the bvh tree, unless they are hidden
 					  and/or selected. Even if the faces themselves are not selected for the snapped
 					  transform, having a vertex selected means the face (and thus it's tesselated
 					  triangles) will be moving and will not be a good snap targets.*/
diff --git a/source/blender/blenkernel/intern/cdderivedmesh.c b/source/blender/blenkernel/intern/cdderivedmesh.c
index 4fafd604e70..50d0f2daab9 100644
--- a/source/blender/blenkernel/intern/cdderivedmesh.c
+++ b/source/blender/blenkernel/intern/cdderivedmesh.c
@@ -1589,11 +1589,11 @@ static void cdDM_foreachMappedFaceCenter(
 
 }
 
-void CDDM_recalc_tesselation_ex(DerivedMesh *dm, const int do_face_nor_cpy)
+void CDDM_recalc_tessellation_ex(DerivedMesh *dm, const int do_face_nor_cpy)
 {
 	CDDerivedMesh *cddm = (CDDerivedMesh*)dm;
 
-	dm->numTessFaceData = mesh_recalcTesselation(&dm->faceData, &dm->loopData, &dm->polyData,
+	dm->numTessFaceData = mesh_recalcTessellation(&dm->faceData, &dm->loopData, &dm->polyData,
 	                                             cddm->mvert,
 	                                             dm->numTessFaceData, dm->numLoopData, dm->numPolyData,
 	                                             do_face_nor_cpy);
@@ -1605,14 +1605,14 @@ void CDDM_recalc_tesselation_ex(DerivedMesh *dm, const int do_face_nor_cpy)
 
 	cddm->mface = CustomData_get_layer(&dm->faceData, CD_MFACE);
 
-	/* Tesselation recreated faceData, and the active layer indices need to get re-propagated
+	/* Tessellation recreated faceData, and the active layer indices need to get re-propagated
 	   from loops and polys to faces */
 	CustomData_bmesh_update_active_layers(&dm->faceData, &dm->polyData, &dm->loopData);
 }
 
-void CDDM_recalc_tesselation(DerivedMesh *dm)
+void CDDM_recalc_tessellation(DerivedMesh *dm)
 {
-	CDDM_recalc_tesselation_ex(dm, TRUE);
+	CDDM_recalc_tessellation_ex(dm, TRUE);
 }
 
 static void cdDM_free_internal(CDDerivedMesh *cddm)
@@ -1674,7 +1674,7 @@ static CDDerivedMesh *cdDM_create(const char *desc)
 	dm->getTessFaceDataArray = DM_get_tessface_data_layer;
 
 	dm->calcNormals = CDDM_calc_normals_mapping;
-	dm->recalcTesselation = CDDM_recalc_tesselation;
+	dm->recalcTessellation = CDDM_recalc_tessellation;
 
 	dm->getVertCos = cdDM_getVertCos;
 	dm->getVertCo = cdDM_getVertCo;
@@ -1928,7 +1928,7 @@ DerivedMesh *CDDM_from_BMEditMesh(BMEditMesh *em, Mesh *UNUSED(me), int use_mdis
 	CustomData_merge(&bm->pdata, &dm->polyData, mask,
 	                 CD_CALLOC, dm->numPolyData);
 	
-	/*add tesselation mface layers*/
+	/*add tessellation mface layers*/
 	if (use_tessface) {
 		CustomData_from_bmeshpoly(&dm->faceData, &dm->polyData, &dm->loopData, em->tottri);
 	}
@@ -2083,7 +2083,7 @@ static DerivedMesh *cddm_copy_ex(DerivedMesh *source, int faces_from_tessfaces)
 #if 0
 	/* BMESH_TODO: Find out why this is necessary (or else find a way to remove
 	   it). If it is necessary, add a comment explaining why. */
-	CDDM_recalc_tesselation((DerivedMesh *)cddm);
+	CDDM_recalc_tessellation((DerivedMesh *)cddm);
 #endif
 
 	return dm;
@@ -2190,15 +2190,15 @@ void CDDM_calc_normals_mapping(DerivedMesh *dm)
 
 
 	if (dm->numTessFaceData == 0) {
-		/* No tesselation on this mesh yet, need to calculate one.
+		/* No tessellation on this mesh yet, need to calculate one.
 		 *
 		 * Important not to update face normals from polys since it
 		 * interfears with assigning the new normal layer in the following code.
 		 */
-		CDDM_recalc_tesselation_ex(dm, FALSE);
+		CDDM_recalc_tessellation_ex(dm, FALSE);
 	}
 	else {
-		/* A tesselation already exists, it should always have a CD_POLYINDEX */
+		/* A tessellation already exists, it should always have a CD_POLYINDEX */
 		BLI_assert(CustomData_has_layer(&dm->faceData, CD_POLYINDEX));
 		CustomData_free_layers(&dm->faceData, CD_NORMAL, dm->numTessFaceData);
 	}
@@ -2269,7 +2269,7 @@ void CDDM_calc_normals_tessface(DerivedMesh *dm)
  *
  * this is a really horribly written function.  ger. - joeedh
  *
- * note, CDDM_recalc_tesselation has to run on the returned DM if you want to access tessfaces.
+ * note, CDDM_recalc_tessellation has to run on the returned DM if you want to access tessfaces.
  */
 DerivedMesh *CDDM_merge_verts(DerivedMesh *dm, const int *vtargetmap)
 {
diff --git a/source/blender/blenkernel/intern/constraint.c b/source/blender/blenkernel/intern/constraint.c
index 9047f0262cd..c66b8da0dcd 100644
--- a/source/blender/blenkernel/intern/constraint.c
+++ b/source/blender/blenkernel/intern/constraint.c
@@ -279,7 +279,7 @@ void constraint_mat_convertspace (Object *ob, bPoseChannel *pchan, float mat[][4
 	
 	/* prevent crashes in these unlikely events  */
 	if (ob==NULL || mat==NULL) return;
-	/* optimise trick - check if need to do anything */
+	/* optimize trick - check if need to do anything */
 	if (from == to) return;
 	
 	/* are we dealing with pose-channels or objects */
@@ -2148,7 +2148,7 @@ static void actcon_get_tarmat (bConstraint *con, bConstraintOb *cob, bConstraint
 		float s, t;
 		short axis;
 		
-		/* initialise return matrix */
+		/* initialize return matrix */
 		unit_m4(ct->matrix);
 		
 		/* get the transform matrix of the target */
@@ -4294,7 +4294,7 @@ static void constraints_init_typeinfo (void)
  */
 bConstraintTypeInfo *get_constraint_typeinfo (int type)
 {
-	/* initialise the type-info list? */
+	/* initialize the type-info list? */
 	if (CTI_INIT) {
 		constraints_init_typeinfo();
 		CTI_INIT = 0;
@@ -4412,7 +4412,7 @@ static bConstraint *add_new_constraint_internal (const char *name, short type)
 
 	/* Determine a basic name, and info */
 	if (cti) {
-		/* initialise constraint data */
+		/* initialize constraint data */
 		con->data = MEM_callocN(cti->size, cti->structName);
 		
 		/* only constraints that change any settings need this */
@@ -4757,7 +4757,7 @@ void get_constraint_targets_for_solving (bConstraint *con, bConstraintOb *cob, L
 		cti->get_constraint_targets(con, targets);
 		
 		/* set matrices 
-		 * 	- calculate if possible, otherwise just initialise as identity matrix 
+		 * 	- calculate if possible, otherwise just initialize as identity matrix 
 		 */
 		if (cti->get_target_matrix) {
 			for (ct= targets->first; ct; ct= ct->next) 
diff --git a/source/blender/blenkernel/intern/displist.c b/source/blender/blenkernel/intern/displist.c
index ea84f73b27f..6383f7b9040 100644
--- a/source/blender/blenkernel/intern/displist.c
+++ b/source/blender/blenkernel/intern/displist.c
@@ -709,7 +709,7 @@ static ModifierData *curve_get_tesselate_point(Scene *scene, Object *ob, int for
 		if (ELEM3(md->type, eModifierType_Hook, eModifierType_Softbody, eModifierType_MeshDeform)) {
 			preTesselatePoint = md;
 
-			/* this modifiers are moving point of tesselation automatically
+			/* this modifiers are moving point of tessellation automatically
 			   (some of them even can't be applied on tesselated curve), set flag
 			   for incformation button in modifier's header */
 			md->mode |= eModifierMode_ApplyOnSpline;
@@ -1168,7 +1168,7 @@ void makeDispListSurf(Scene *scene, Object *ob, ListBase *dispbase,
 	}
 
 	/* make copy of 'undeformed" displist for texture space calculation
-	   actually, it's not totally undeformed -- pre-tesselation modifiers are
+	   actually, it's not totally undeformed -- pre-tessellation modifiers are
 	   already applied, thats how it worked for years, so keep for compatibility (sergey) */
 	copy_displist(&cu->disp, dispbase);
 
@@ -1394,7 +1394,7 @@ static void do_makeDispListCurveTypes(Scene *scene, Object *ob, ListBase *dispba
 		if(cu->flag & CU_PATH) calc_curvepath(ob);
 
 		/* make copy of 'undeformed" displist for texture space calculation
-		   actually, it's not totally undeformed -- pre-tesselation modifiers are
+		   actually, it's not totally undeformed -- pre-tessellation modifiers are
 		   already applied, thats how it worked for years, so keep for compatibility (sergey) */
 		copy_displist(&cu->disp, dispbase);
 
diff --git a/source/blender/blenkernel/intern/editderivedmesh.c b/source/blender/blenkernel/intern/editderivedmesh.c
index f0fb5cc64b4..139f7d55438 100644
--- a/source/blender/blenkernel/intern/editderivedmesh.c
+++ b/source/blender/blenkernel/intern/editderivedmesh.c
@@ -75,7 +75,7 @@ BMEditMesh *BMEdit_Create(BMesh *bm, int do_tesselate)
 
 	tm->bm = bm;
 	if (do_tesselate) {
-		BMEdit_RecalcTesselation(tm);
+		BMEdit_RecalcTessellation(tm);
 	}
 
 	return tm;
@@ -90,12 +90,12 @@ BMEditMesh *BMEdit_Copy(BMEditMesh *tm)
 
 	tm2->bm = BM_mesh_copy(tm->bm);
 
-	/*The tesselation is NOT calculated on the copy here,
+	/*The tessellation is NOT calculated on the copy here,
 	  because currently all the callers of this function use
 	  it to make a backup copy of the BMEditMesh to restore
 	  it in the case of errors in an operation. For perf
 	  reasons, in that case it makes more sense to do the
-	  tesselation only when/if that copy ends up getting
+	  tessellation only when/if that copy ends up getting
 	  used.*/
 	tm2->looptris = NULL;
 
@@ -106,7 +106,7 @@ BMEditMesh *BMEdit_Copy(BMEditMesh *tm)
 	return tm2;
 }
 
-static void BMEdit_RecalcTesselation_intern(BMEditMesh *tm)
+static void BMEdit_RecalcTessellation_intern(BMEditMesh *tm)
 {
 	/* use this to avoid locking pthread for _every_ polygon
 	 * and calling the fill function */
@@ -245,21 +245,21 @@ static void BMEdit_RecalcTesselation_intern(BMEditMesh *tm)
 
 }
 
-void BMEdit_RecalcTesselation(BMEditMesh *em)
+void BMEdit_RecalcTessellation(BMEditMesh *em)
 {
-	BMEdit_RecalcTesselation_intern(em);
+	BMEdit_RecalcTessellation_intern(em);
 
 	/* commented because editbmesh_build_data() ensures we get tessfaces */
 #if 0
 	if (em->derivedFinal && em->derivedFinal == em->derivedCage) {
-		if (em->derivedFinal->recalcTesselation)
-			em->derivedFinal->recalcTesselation(em->derivedFinal);
+		if (em->derivedFinal->recalcTessellation)
+			em->derivedFinal->recalcTessellation(em->derivedFinal);
 	}
 	else if (em->derivedFinal) {
-		if (em->derivedCage->recalcTesselation)
-			em->derivedCage->recalcTesselation(em->derivedCage);
-		if (em->derivedFinal->recalcTesselation)
-			em->derivedFinal->recalcTesselation(em->derivedFinal);
+		if (em->derivedCage->recalcTessellation)
+			em->derivedCage->recalcTessellation(em->derivedCage);
+		if (em->derivedFinal->recalcTessellation)
+			em->derivedFinal->recalcTessellation(em->derivedFinal);
 	}
 #endif
 }
@@ -314,13 +314,13 @@ void BMEdit_Free(BMEditMesh *em)
 ok, basic design:
 
 the bmesh derivedmesh exposes the mesh as triangles.  it stores pointers
-to three loops per triangle.  the derivedmesh stores a cache of tesselations
+to three loops per triangle.  the derivedmesh stores a cache of tessellations
 for each face.  this cache will smartly update as needed (though at first
 it'll simply be more brute force).  keeping track of face/edge counts may
 be a small problbm.
 
 this won't be the most efficient thing, considering that internal edges and
-faces of tesselations are exposed.  looking up an edge by index in particular
+faces of tessellations are exposed.  looking up an edge by index in particular
 is likely to be a little slow.
 */
 
@@ -345,7 +345,7 @@ static void emDM_calcNormals(DerivedMesh *UNUSED(dm))
 	   BMVerts and BMFaces */
 }
 
-static void emDM_recalcTesselation(DerivedMesh *UNUSED(dm))
+static void emDM_recalcTessellation(DerivedMesh *UNUSED(dm))
 {
 	/* do nothing */
 }
@@ -1635,7 +1635,7 @@ DerivedMesh *getEditDerivedBMesh(
 	bmdm->dm.getTessFaceDataArray = emDM_getTessFaceDataArray;
 
 	bmdm->dm.calcNormals = emDM_calcNormals;
-	bmdm->dm.recalcTesselation = emDM_recalcTesselation;
+	bmdm->dm.recalcTessellation = emDM_recalcTessellation;
 
 	bmdm->dm.foreachMappedVert = emDM_foreachMappedVert;
 	bmdm->dm.foreachMappedEdge = emDM_foreachMappedEdge;
diff --git a/source/blender/blenkernel/intern/fcurve.c b/source/blender/blenkernel/intern/fcurve.c
index fa20db0fe72..1c6c229d8fc 100644
--- a/source/blender/blenkernel/intern/fcurve.c
+++ b/source/blender/blenkernel/intern/fcurve.c
@@ -362,7 +362,7 @@ int binarysearch_bezt_index (BezTriple array[], float frame, int arraylen, short
 	int start=0, end=arraylen;
 	int loopbreaker= 0, maxloop= arraylen * 2;
 	
-	/* initialise replace-flag first */
+	/* initialize replace-flag first */
 	*replace= 0;
 	
 	/* sneaky optimisations (don't go through searching process if...):
diff --git a/source/blender/blenkernel/intern/fmodifier.c b/source/blender/blenkernel/intern/fmodifier.c
index d1edd2c9d0f..19b036d9ccf 100644
--- a/source/blender/blenkernel/intern/fmodifier.c
+++ b/source/blender/blenkernel/intern/fmodifier.c
@@ -957,7 +957,7 @@ static void fmods_init_typeinfo (void)
  */
 FModifierTypeInfo *get_fmodifier_typeinfo (int type)
 {
-	/* initialise the type-info list? */
+	/* initialize the type-info list? */
 	if (FMI_INIT) {
 		fmods_init_typeinfo();
 		FMI_INIT = 0;
@@ -1243,7 +1243,7 @@ static float eval_fmodifier_influence (FModifier *fcm, float evaltime)
 }
 
 /* evaluate time modifications imposed by some F-Curve Modifiers
- *	- this step acts as an optimisation to prevent the F-Curve stack being evaluated 
+ *	- this step acts as an optimization to prevent the F-Curve stack being evaluated 
  *	  several times by modifiers requesting the time be modified, as the final result
  *	  would have required using the modified time
  *	- modifiers only ever receive the unmodified time, as subsequent modifiers should be
diff --git a/source/blender/blenkernel/intern/mesh.c b/source/blender/blenkernel/intern/mesh.c
index 33ef226f411..23cda362f74 100644
--- a/source/blender/blenkernel/intern/mesh.c
+++ b/source/blender/blenkernel/intern/mesh.c
@@ -303,7 +303,7 @@ const char *mesh_cmp(Mesh *me1, Mesh *me2, float thresh)
 	return NULL;
 }
 
-static void mesh_ensure_tesselation_customdata(Mesh *me)
+static void mesh_ensure_tessellation_customdata(Mesh *me)
 {
 	const int tottex_original = CustomData_number_of_layers(&me->pdata, CD_MTEXPOLY);
 	const int totcol_original = CustomData_number_of_layers(&me->ldata, CD_MLOOPCOL);
@@ -322,7 +322,7 @@ static void mesh_ensure_tesselation_customdata(Mesh *me)
 		 * first time from bmesh, rather then giving a warning about this we could be smarter
 		 * and check if there was any data to begin with, for now just print the warning with
 		 * some info to help troubleshoot whats going on - campbell */
-		printf("%s: warning! Tesselation uvs or vcol data got out of sync, "
+		printf("%s: warning! Tessellation uvs or vcol data got out of sync, "
 		       "had to reset!\n    CD_MTFACE: %d != CD_MTEXPOLY: %d || CD_MCOL: %d != CD_MLOOPCOL: %d\n",
 		       __func__, tottex_tessface, tottex_original, totcol_tessface, totcol_original);
 	}
@@ -340,7 +340,7 @@ static void mesh_update_linked_customdata(Mesh *me, const short do_ensure_tess_c
 		BMEdit_UpdateLinkedCustomData(me->edit_btmesh);
 
 	if (do_ensure_tess_cd) {
-		mesh_ensure_tesselation_customdata(me);
+		mesh_ensure_tessellation_customdata(me);
 	}
 
 	CustomData_bmesh_update_active_layers(&me->fdata, &me->pdata, &me->ldata);
@@ -1688,7 +1688,7 @@ void mesh_calc_normals_mapping_ex(MVert *mverts, int numVerts,
 			}
 			else {
 				/* eek, we're not corresponding to polys */
-				printf("error in mesh_calc_normals; tesselation face indices are incorrect.  normals may look bad.\n");
+				printf("error in mesh_calc_normals; tessellation face indices are incorrect.  normals may look bad.\n");
 			}
 		}
 	}
@@ -2185,10 +2185,10 @@ void mesh_loops_to_mface_corners(CustomData *fdata, CustomData *ldata,
 }
 
 /*
-  this function recreates a tesselation.
-  returns number of tesselation faces.
+  this function recreates a tessellation.
+  returns number of tessellation faces.
  */
-int mesh_recalcTesselation(CustomData *fdata,
+int mesh_recalcTessellation(CustomData *fdata,
                            CustomData *ldata, CustomData *pdata,
                            MVert *mvert, int totface, int UNUSED(totloop),
                            int totpoly,
@@ -2467,8 +2467,8 @@ int mesh_recalcTesselation(CustomData *fdata,
 #ifdef USE_BMESH_SAVE_AS_COMPAT
 
 /*
- * this function recreates a tesselation.
- * returns number of tesselation faces.
+ * this function recreates a tessellation.
+ * returns number of tessellation faces.
  */
 int mesh_mpoly_to_mface(struct CustomData *fdata, struct CustomData *ldata,
 	struct CustomData *pdata, int totface, int UNUSED(totloop), int totpoly)
@@ -2946,7 +2946,7 @@ void BKE_mesh_ensure_navmesh(Mesh *me)
 
 void BKE_mesh_tessface_calc(Mesh *mesh)
 {
-	mesh->totface = mesh_recalcTesselation(&mesh->fdata, &mesh->ldata, &mesh->pdata,
+	mesh->totface = mesh_recalcTessellation(&mesh->fdata, &mesh->ldata, &mesh->pdata,
 	                                       mesh->mvert,
 	                                       mesh->totface, mesh->totloop, mesh->totpoly,
 	                                       /* calc normals right after, dont copy from polys here */
diff --git a/source/blender/blenkernel/intern/modifiers_bmesh.c b/source/blender/blenkernel/intern/modifiers_bmesh.c
index fb7e18e295e..da8af1357ab 100644
--- a/source/blender/blenkernel/intern/modifiers_bmesh.c
+++ b/source/blender/blenkernel/intern/modifiers_bmesh.c
@@ -157,7 +157,7 @@ BMEditMesh *DM_to_editbmesh(Object *ob, DerivedMesh *dm, BMEditMesh *existing, i
 	}
 	else {
 		if (do_tesselate) {
-			BMEdit_RecalcTesselation(em);
+			BMEdit_RecalcTessellation(em);
 		}
 	}
 
diff --git a/source/blender/blenkernel/intern/nla.c b/source/blender/blenkernel/intern/nla.c
index e5400cf13f2..814f0715d11 100644
--- a/source/blender/blenkernel/intern/nla.c
+++ b/source/blender/blenkernel/intern/nla.c
@@ -841,7 +841,7 @@ void BKE_nlameta_flush_transforms (NlaStrip *mstrip)
 	oEnd= ((NlaStrip *)mstrip->strips.last)->end;
 	offset= mstrip->start - oStart;
 	
-	/* optimisation:
+	/* optimization:
 	 * don't flush if nothing changed yet
 	 *	TODO: maybe we need a flag to say always flush?
 	 */
@@ -1018,7 +1018,7 @@ short BKE_nlatrack_get_bounds (NlaTrack *nlt, float bounds[2])
 {
 	NlaStrip *strip;
 	
-	/* initialise bounds */
+	/* initialize bounds */
 	if (bounds)
 		bounds[0] = bounds[1] = 0.0f;
 	else
diff --git a/source/blender/blenkernel/intern/shrinkwrap.c b/source/blender/blenkernel/intern/shrinkwrap.c
index dde3aeba75d..efc3477298c 100644
--- a/source/blender/blenkernel/intern/shrinkwrap.c
+++ b/source/blender/blenkernel/intern/shrinkwrap.c
@@ -287,7 +287,7 @@ static void shrinkwrap_calc_normal_projection(ShrinkwrapCalcData *calc)
 	BVHTreeRayHit hit;
 	BVHTreeFromMesh treeData= NULL_BVHTreeFromMesh;
 
-	//auxiliar target
+	//auxiliary target
 	DerivedMesh *auxMesh	= NULL;
 	BVHTreeFromMesh auxData	= NULL_BVHTreeFromMesh;
 	SpaceTransform local2aux;
@@ -306,7 +306,7 @@ static void shrinkwrap_calc_normal_projection(ShrinkwrapCalcData *calc)
 	else
 	{
 		//The code supports any axis that is a combination of X,Y,Z
-		//altought currently UI only allows to set the 3 different axis
+		//although currently UI only allows to set the 3 different axis
 		if(calc->smd->projAxis & MOD_SHRINKWRAP_PROJECT_OVER_X_AXIS) proj_axis[0] = 1.0f;
 		if(calc->smd->projAxis & MOD_SHRINKWRAP_PROJECT_OVER_Y_AXIS) proj_axis[1] = 1.0f;
 		if(calc->smd->projAxis & MOD_SHRINKWRAP_PROJECT_OVER_Z_AXIS) proj_axis[2] = 1.0f;
diff --git a/source/blender/blenkernel/intern/softbody.c b/source/blender/blenkernel/intern/softbody.c
index c4ea41f41b3..4f48fb0270f 100644
--- a/source/blender/blenkernel/intern/softbody.c
+++ b/source/blender/blenkernel/intern/softbody.c
@@ -860,7 +860,7 @@ static void renew_softbody(Scene *scene, Object *ob, int totpoint, int totspring
 		if (totspring)
 			sb->bspring= MEM_mallocN( totspring*sizeof(BodySpring), "bodyspring");
 
-			/* initialise BodyPoint array */
+			/* initialize BodyPoint array */
 		for (i=0; i<totpoint; i++) {
 			BodyPoint *bp = &sb->bpoint[i];
 
diff --git a/source/blender/blenkernel/intern/subsurf_ccg.c b/source/blender/blenkernel/intern/subsurf_ccg.c
index 09056654e09..7f67bb27bf6 100644
--- a/source/blender/blenkernel/intern/subsurf_ccg.c
+++ b/source/blender/blenkernel/intern/subsurf_ccg.c
@@ -2858,7 +2858,7 @@ static struct PBVH *ccgDM_getPBVH(Object *ob, DerivedMesh *dm)
 	return ccgdm->pbvh;
 }
 
-static void ccgDM_recalcTesselation(DerivedMesh *UNUSED(dm))
+static void ccgDM_recalcTessellation(DerivedMesh *UNUSED(dm))
 {
 	/* Nothing to do: CCG handles creating its own tessfaces */
 }
@@ -2967,7 +2967,7 @@ static CCGDerivedMesh *getCCGDerivedMesh(CCGSubSurf *ss,
 	ccgdm->dm.copyTessFaceArray = ccgDM_copyFinalFaceArray;
 
 	ccgdm->dm.calcNormals = ccgDM_calcNormals;
-	ccgdm->dm.recalcTesselation = ccgDM_recalcTesselation;
+	ccgdm->dm.recalcTessellation = ccgDM_recalcTessellation;
 
 	ccgdm->dm.getVertCos = ccgdm_getVertCos;
 	ccgdm->dm.foreachMappedVert = ccgDM_foreachMappedVert;