diff options
author | Campbell Barton <ideasman42@gmail.com> | 2018-04-25 13:26:26 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2018-04-25 13:26:26 +0300 |
commit | 2de00f495d6cb802f94711871e92eddc9dc2650f (patch) | |
tree | b8b0d230e571f76ed1d7bb0f7063cc1105ee7d71 /source | |
parent | 791b9d821b2ff840ee42177e71c5a285fca91a36 (diff) | |
parent | 9a7f963a02aea2300f2f740c004c398db2a3dac3 (diff) |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source')
-rw-r--r-- | source/blender/modifiers/intern/MOD_array.c | 4 | ||||
-rw-r--r-- | source/blender/modifiers/intern/MOD_mirror.c | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/source/blender/modifiers/intern/MOD_array.c b/source/blender/modifiers/intern/MOD_array.c index 42e3cf94d00..c87816cb0ea 100644 --- a/source/blender/modifiers/intern/MOD_array.c +++ b/source/blender/modifiers/intern/MOD_array.c @@ -514,8 +514,8 @@ 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 - * now add mvert/medge/mface layers */ + /* Subsurf for eg wont have mesh data in the custom data arrays. + * now add mvert/medge/mpoly layers. */ if (!CustomData_has_layer(&dm->vertData, CD_MVERT)) { dm->copyVertArray(dm, result_dm_verts); diff --git a/source/blender/modifiers/intern/MOD_mirror.c b/source/blender/modifiers/intern/MOD_mirror.c index 1f51d5dba11..84667e278fc 100644 --- a/source/blender/modifiers/intern/MOD_mirror.c +++ b/source/blender/modifiers/intern/MOD_mirror.c @@ -140,8 +140,8 @@ static DerivedMesh *doMirrorOnAxis(MirrorModifierData *mmd, DM_copy_poly_data(dm, result, 0, 0, maxPolys); - /* subsurf for eg wont have mesh data in the */ - /* now add mvert/medge/mface layers */ + /* Subsurf for eg wont have mesh data in the custom data arrays. + * now add mvert/medge/mpoly layers. */ if (!CustomData_has_layer(&dm->vertData, CD_MVERT)) { dm->copyVertArray(dm, CDDM_get_verts(result)); |