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_mirror.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_mirror.c')
| -rw-r--r-- | source/blender/modifiers/intern/MOD_mirror.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/modifiers/intern/MOD_mirror.c b/source/blender/modifiers/intern/MOD_mirror.c index 4b16f165a12..132280e7f15 100644 --- a/source/blender/modifiers/intern/MOD_mirror.c +++ b/source/blender/modifiers/intern/MOD_mirror.c @@ -134,7 +134,7 @@ static Mesh *doMirrorOnAxis( CustomData_copy_data(&mesh->ldata, &result->ldata, 0, 0, maxLoops); CustomData_copy_data(&mesh->pdata, &result->pdata, 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(&mesh->vdata, CD_MVERT)) { memcpy(result->mvert, mesh->mvert, sizeof(*result->mvert) * mesh->totvert); |