Merge branch 'master' into blender2.8

This commit is contained in:
Campbell Barton 2018-04-25 12:26:26 +02:00
commit 2de00f495d
2 changed files with 4 additions and 4 deletions

View File

@ -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);

View File

@ -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));