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_solidify.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_solidify.c')
| -rw-r--r-- | source/blender/modifiers/intern/MOD_solidify.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/modifiers/intern/MOD_solidify.c b/source/blender/modifiers/intern/MOD_solidify.c index 1fac637a9ef..7c6ccbeb0d7 100644 --- a/source/blender/modifiers/intern/MOD_solidify.c +++ b/source/blender/modifiers/intern/MOD_solidify.c @@ -815,7 +815,7 @@ static Mesh *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]); |