diff options
| author | Bastien Montagne <montagne29@wanadoo.fr> | 2018-09-03 18:44:36 +0300 |
|---|---|---|
| committer | Bastien Montagne <montagne29@wanadoo.fr> | 2018-09-03 18:44:36 +0300 |
| commit | a43ebc63fafeb3b945529117a2efacc80399d272 (patch) | |
| tree | d8ab3e90e50177874f2423b3bc1486548dccd7dd /source/blender/modifiers/intern/MOD_screw.c | |
| parent | b46e987a70682fcfc227ec71e9726c3ad6a230db (diff) | |
| parent | 265ec400ab1945cd7bc78d50b7d8f184c01fdd10 (diff) | |
Merge branch 'master' into blender2.8
Conflicts:
source/blender/blenkernel/intern/collision.c
Diffstat (limited to 'source/blender/modifiers/intern/MOD_screw.c')
| -rw-r--r-- | source/blender/modifiers/intern/MOD_screw.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/source/blender/modifiers/intern/MOD_screw.c b/source/blender/modifiers/intern/MOD_screw.c index 96335707082..42e9d8fddf8 100644 --- a/source/blender/modifiers/intern/MOD_screw.c +++ b/source/blender/modifiers/intern/MOD_screw.c @@ -58,7 +58,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 Mesh *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 Mesh *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 Mesh *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 Mesh *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++) { |