From 4da2acae3ab1a40db8be7f7df36da29cfcbf280c Mon Sep 17 00:00:00 2001 From: Brecht Van Lommel Date: Mon, 3 Sep 2018 16:49:08 +0200 Subject: Spelling fixes in comments and descriptions, patch by luzpaz. Differential Revision: https://developer.blender.org/D3668 --- source/blender/modifiers/intern/MOD_array.c | 2 +- source/blender/modifiers/intern/MOD_laplaciandeform.c | 6 +++--- source/blender/modifiers/intern/MOD_laplaciansmooth.c | 6 +++--- source/blender/modifiers/intern/MOD_mirror.c | 2 +- source/blender/modifiers/intern/MOD_screw.c | 10 +++++----- source/blender/modifiers/intern/MOD_simpledeform.c | 6 +++--- source/blender/modifiers/intern/MOD_solidify.c | 2 +- source/blender/modifiers/intern/MOD_surfacedeform.c | 2 +- source/blender/modifiers/intern/MOD_weightvgproximity.c | 2 +- 9 files changed, 19 insertions(+), 19 deletions(-) (limited to 'source/blender/modifiers') diff --git a/source/blender/modifiers/intern/MOD_array.c b/source/blender/modifiers/intern/MOD_array.c index a69af265a17..d7f6c263906 100644 --- a/source/blender/modifiers/intern/MOD_array.c +++ b/source/blender/modifiers/intern/MOD_array.c @@ -551,7 +551,7 @@ static DerivedMesh *arrayModifier_doArray( DM_copy_loop_data(dm, result, 0, 0, chunk_nloops); DM_copy_poly_data(dm, result, 0, 0, chunk_npolys); - /* Subsurf for eg wont have mesh data in the custom data arrays. + /* Subsurf for eg won't have mesh data in the custom data arrays. * now add mvert/medge/mpoly layers. */ if (!CustomData_has_layer(&dm->vertData, CD_MVERT)) { diff --git a/source/blender/modifiers/intern/MOD_laplaciandeform.c b/source/blender/modifiers/intern/MOD_laplaciandeform.c index 81cfa980135..6f963b7f1a4 100644 --- a/source/blender/modifiers/intern/MOD_laplaciandeform.c +++ b/source/blender/modifiers/intern/MOD_laplaciandeform.c @@ -67,7 +67,7 @@ typedef struct LaplacianSystem { float (*co)[3]; /* Original vertex coordinates */ float (*no)[3]; /* Original vertex normal */ float (*delta)[3]; /* Differential Coordinates */ - unsigned int (*tris)[3]; /* Copy of MLoopTri (tesselation triangle) v1-v3 */ + unsigned int (*tris)[3]; /* Copy of MLoopTri (tessellation triangle) v1-v3 */ int *index_anchors; /* Static vertex index list */ int *unit_verts; /* Unit vectors of projected edges onto the plane orthogonal to n */ int *ringf_indices; /* Indices of faces per vertex */ @@ -209,7 +209,7 @@ static void createVertRingMap( /** * This method computes the Laplacian Matrix and Differential Coordinates for all vertex in the mesh. * The Linear system is LV = d - * Where L is Laplacian Matrix, V as the vertexes in Mesh, d is the differential coordinates + * Where L is Laplacian Matrix, V as the vertices in Mesh, d is the differential coordinates * The Laplacian Matrix is computes as a * Lij = sum(Wij) (if i == j) * Lij = Wij (if i != j) @@ -219,7 +219,7 @@ static void createVertRingMap( * di = Vi * sum(Wij) - sum(Wij * Vj) * Where : * di is the Differential Coordinate i - * sum (Wij) is the sum of all weights between vertex Vi and its vertexes neighbors (Vj) + * sum (Wij) is the sum of all weights between vertex Vi and its vertices neighbors (Vj) * sum (Wij * Vj) is the sum of the product between vertex neighbor Vj and weight Wij for all neighborhood. * * This Laplacian Matrix is described in the paper: diff --git a/source/blender/modifiers/intern/MOD_laplaciansmooth.c b/source/blender/modifiers/intern/MOD_laplaciansmooth.c index 49b9c4af29c..7d26e76832d 100644 --- a/source/blender/modifiers/intern/MOD_laplaciansmooth.c +++ b/source/blender/modifiers/intern/MOD_laplaciansmooth.c @@ -60,8 +60,8 @@ struct BLaplacianSystem { int numLoops; /* Number of edges*/ int numPolys; /* Number of faces*/ int numVerts; /* Number of verts*/ - short *numNeFa; /* Number of neighboors faces around vertice*/ - short *numNeEd; /* Number of neighboors Edges around vertice*/ + short *numNeFa; /* Number of neighbors faces around vertice*/ + short *numNeEd; /* Number of neighbors Edges around vertice*/ short *zerola; /* Is zero area or length*/ /* Pointers to data*/ @@ -268,7 +268,7 @@ static void init_laplacian_matrix(LaplacianSystem *sys) for (i = 0; i < sys->numEdges; i++) { idv1 = sys->medges[i].v1; idv2 = sys->medges[i].v2; - /* if is boundary, apply scale-dependent umbrella operator only with neighboors in boundary */ + /* if is boundary, apply scale-dependent umbrella operator only with neighbors in boundary */ if (sys->numNeEd[idv1] != sys->numNeFa[idv1] && sys->numNeEd[idv2] != sys->numNeFa[idv2]) { sys->vlengths[idv1] += sys->eweights[i]; sys->vlengths[idv2] += sys->eweights[i]; diff --git a/source/blender/modifiers/intern/MOD_mirror.c b/source/blender/modifiers/intern/MOD_mirror.c index 3f6480562d9..aeb28b3ecb0 100644 --- a/source/blender/modifiers/intern/MOD_mirror.c +++ b/source/blender/modifiers/intern/MOD_mirror.c @@ -144,7 +144,7 @@ static DerivedMesh *doMirrorOnAxis( DM_copy_poly_data(dm, result, 0, 0, maxPolys); - /* Subsurf for eg wont have mesh data in the custom data arrays. + /* Subsurf for eg won't have mesh data in the custom data arrays. * now add mvert/medge/mpoly layers. */ if (!CustomData_has_layer(&dm->vertData, CD_MVERT)) { diff --git a/source/blender/modifiers/intern/MOD_screw.c b/source/blender/modifiers/intern/MOD_screw.c index 5c1296d222e..18a551f6daa 100644 --- a/source/blender/modifiers/intern/MOD_screw.c +++ b/source/blender/modifiers/intern/MOD_screw.c @@ -57,7 +57,7 @@ /* used for gathering edge connectivity */ typedef struct ScrewVertConnect { float dist; /* distance from the center axis */ - float co[3]; /* loaction relative to the transformed axis */ + float co[3]; /* location relative to the transformed axis */ float no[3]; /* calc normal of the vertex */ unsigned int v[2]; /* 2 verts on either side of this one */ MEdge *e[2]; /* edges on either side, a bit of a waste since each edge ref's 2 edges */ @@ -297,7 +297,7 @@ static DerivedMesh *applyModifier( /* angle */ -#if 0 /* cant incluide this, not predictable enough, though quite fun. */ +#if 0 /* can't include this, not predictable enough, though quite fun. */ if (ltmd->flag & MOD_SCREW_OBJECT_ANGLE) { float mtx3_tx[3][3]; copy_m3_m4(mtx3_tx, mtx_tx); @@ -673,7 +673,7 @@ static DerivedMesh *applyModifier( if (tmpf1[ltmd->axis] < vc_tmp->co[ltmd->axis]) { /* best is above */ ed_loop_flip = 1; } - else { /* best is below or even... in even case we cant know whet to do. */ + else { /* best is below or even... in even case we can't know what to do. */ ed_loop_flip = 0; } @@ -809,7 +809,7 @@ static DerivedMesh *applyModifier( copy_v3_v3(vc->no, vc->co); } - /* we wont be looping on this data again so copy normals here */ + /* we won't be looping on this data again so copy normals here */ if ((angle < 0.0f) != do_flip) negate_v3(vc->no); @@ -897,7 +897,7 @@ static DerivedMesh *applyModifier( } if (close) { - /* last loop of edges, previous loop dosnt account for the last set of edges */ + /* last loop of edges, previous loop doesn't account for the last set of edges */ const unsigned int varray_stride = (step_tot - 1) * totvert; for (i = 0; i < totvert; i++) { diff --git a/source/blender/modifiers/intern/MOD_simpledeform.c b/source/blender/modifiers/intern/MOD_simpledeform.c index b3982bc5f3e..d14310d9199 100644 --- a/source/blender/modifiers/intern/MOD_simpledeform.c +++ b/source/blender/modifiers/intern/MOD_simpledeform.c @@ -50,7 +50,7 @@ #define BEND_EPS 0.000001f -/* Re-maps the indicies for X Y Z by shifting them up and wrapping, such that +/* Re-maps the indices for X Y Z by shifting them up and wrapping, such that * X = Y, Y = Z, Z = X (for X axis), and X = Z, Y = X, Z = Y (for Y axis). This * exists because the deformations (excluding bend) are based on the Z axis. * Having this helps avoid long, drawn out switches. */ @@ -199,7 +199,7 @@ static void SimpleDeformModifier_do( /* This is historically the lock axis, _not_ the deform axis as the name would imply */ const int deform_axis = smd->deform_axis; int lock_axis = smd->axis; - if (smd->mode == MOD_SIMPLEDEFORM_MODE_BEND) { /* Bend mode shouln't have any lock axis */ + if (smd->mode == MOD_SIMPLEDEFORM_MODE_BEND) { /* Bend mode shouldn't have any lock axis */ lock_axis = 0; } else { @@ -263,7 +263,7 @@ static void SimpleDeformModifier_do( } - /* SMD values are normalized to the BV, calculate the absolut values */ + /* SMD values are normalized to the BV, calculate the absolute values */ smd_limit[1] = lower + (upper - lower) * smd->limit[1]; smd_limit[0] = lower + (upper - lower) * smd->limit[0]; diff --git a/source/blender/modifiers/intern/MOD_solidify.c b/source/blender/modifiers/intern/MOD_solidify.c index 572898c1982..8cf288e19ae 100644 --- a/source/blender/modifiers/intern/MOD_solidify.c +++ b/source/blender/modifiers/intern/MOD_solidify.c @@ -813,7 +813,7 @@ static DerivedMesh *applyModifier( mp->flag = mpoly[fidx].flag; /* notice we use 'mp->totloop' which is later overwritten, - * we could lookup the original face but theres no point since this is a copy + * we could lookup the original face but there's no point since this is a copy * and will have the same value, just take care when changing order of assignment */ k1 = mpoly[fidx].loopstart + (((edge_order[eidx] - 1) + mp->totloop) % mp->totloop); /* prev loop */ k2 = mpoly[fidx].loopstart + (edge_order[eidx]); diff --git a/source/blender/modifiers/intern/MOD_surfacedeform.c b/source/blender/modifiers/intern/MOD_surfacedeform.c index 95347128ef9..84e2bf8941d 100644 --- a/source/blender/modifiers/intern/MOD_surfacedeform.c +++ b/source/blender/modifiers/intern/MOD_surfacedeform.c @@ -1035,7 +1035,7 @@ static bool surfacedeformBind( } else if (data.success == MOD_SDEF_BIND_RESULT_GENERIC_ERR) { /* I know this message is vague, but I could not think of a way - * to explain this whith a reasonably sized message. + * to explain this with a reasonably sized message. * Though it shouldn't really matter all that much, * because this is very unlikely to occur */ modifier_setError((ModifierData *)smd, "Target contains invalid polygons"); diff --git a/source/blender/modifiers/intern/MOD_weightvgproximity.c b/source/blender/modifiers/intern/MOD_weightvgproximity.c index 47db0a3371f..b98036b9913 100644 --- a/source/blender/modifiers/intern/MOD_weightvgproximity.c +++ b/source/blender/modifiers/intern/MOD_weightvgproximity.c @@ -81,7 +81,7 @@ typedef struct Vert2GeomData { float *dist[3]; } Vert2GeomData; -/* Data which is localized to each computed chunk (i.e. thread-safe, and with continous subset of index range). */ +/* Data which is localized to each computed chunk (i.e. thread-safe, and with continuous subset of index range). */ typedef struct Vert2GeomDataChunk { /* Read-only data */ float last_hit_co[3][3]; -- cgit v1.2.3