diff options
| author | Jeroen Bakker <j.bakker@atmind.nl> | 2022-09-09 22:09:51 +0300 |
|---|---|---|
| committer | Jeroen Bakker <j.bakker@atmind.nl> | 2022-09-09 22:09:51 +0300 |
| commit | 5082fd5e63737bf8cb76478d143647e1907d13f4 (patch) | |
| tree | 8736fcf031cdee3a7c10d0a7ebc60578f81dea06 /source/blender/modifiers/intern/MOD_array.c | |
| parent | b3400d012a33fa774a20893993b3e7ed9b9f1f97 (diff) | |
| parent | 1e1e9014cfc9f47d8496dd283a1cccae0ce29552 (diff) | |
Merge branch 'master' into temp-T73411-add-scene-parameters
Diffstat (limited to 'source/blender/modifiers/intern/MOD_array.c')
| -rw-r--r-- | source/blender/modifiers/intern/MOD_array.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/source/blender/modifiers/intern/MOD_array.c b/source/blender/modifiers/intern/MOD_array.c index bcf1bd36539..7feff30968f 100644 --- a/source/blender/modifiers/intern/MOD_array.c +++ b/source/blender/modifiers/intern/MOD_array.c @@ -294,7 +294,7 @@ static void mesh_merge_transform(Mesh *result, for (i = 0; i < cap_nverts; i++, mv++) { mul_m4_v3(cap_offset, mv->co); /* Reset MVert flags for caps */ - mv->flag = mv->bweight = 0; + mv->flag = 0; } /* We have to correct normals too, if we do not tag them as dirty later! */ @@ -560,8 +560,8 @@ static Mesh *arrayModifier_doArray(ArrayModifierData *amd, CustomData_copy_data(&mesh->ldata, &result->ldata, 0, 0, chunk_nloops); CustomData_copy_data(&mesh->pdata, &result->pdata, 0, 0, chunk_npolys); - /* Subsurf for eg won't have mesh data in the custom data arrays. - * now add mvert/medge/mpoly layers. */ + /* Subdivision-surface 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_verts, src_verts, sizeof(MVert) * mesh->totvert); } |