diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2018-07-13 09:37:20 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2018-07-13 09:40:17 +0300 |
| commit | a855a763c253fd61fce49002307b2c6f14aa50ed (patch) | |
| tree | 11c6a4850194154182a7fb46a1957748cb6a7322 /source/blender/blenkernel/intern/mesh_merge.c | |
| parent | a81d0108fc8c7cdea14042e7a59ab00ba2633e72 (diff) | |
| parent | fb5597540decca4b490089134890d3e575477e95 (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/blenkernel/intern/mesh_merge.c')
| -rw-r--r-- | source/blender/blenkernel/intern/mesh_merge.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/source/blender/blenkernel/intern/mesh_merge.c b/source/blender/blenkernel/intern/mesh_merge.c index 27ba7e76fa3..d49ca507e02 100644 --- a/source/blender/blenkernel/intern/mesh_merge.c +++ b/source/blender/blenkernel/intern/mesh_merge.c @@ -383,9 +383,10 @@ Mesh *BKE_mesh_merge_verts(Mesh *mesh, const int *vtargetmap, const int tot_vtar /* Can we optimise by reusing an old pmap ? How do we know an old pmap is stale ? */ /* When called by MOD_array.c, the cddm has just been created, so it has no valid pmap. */ - BKE_mesh_vert_poly_map_create(&poly_map, &poly_map_mem, - mesh->mpoly, mesh->mloop, - totvert, totpoly, totloop); + BKE_mesh_vert_poly_map_create( + &poly_map, &poly_map_mem, + mesh->mpoly, mesh->mloop, + totvert, totpoly, totloop); } /* done preparing for fast poly compare */ |