diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2015-02-23 05:43:09 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2015-02-23 05:57:06 +0300 |
| commit | 5a372dbd89a6adcad4191a5256ab66e607ab5d89 (patch) | |
| tree | 66ee7f07f58b92db023a27755e0c876455254c4c /source/blender/bmesh/tools/bmesh_decimate_collapse.c | |
| parent | 50c977b54d543cca93fb747a99b15682b5d15dfb (diff) | |
Fix error in recent vert/edge-slide commits
`CustomData_bmesh_interp_n` was expecting the 'dest' arg not to have its offset applied.
This was a bit confusing since the source args have it applied,
and in some cases we only have the destination with the offset.
Diffstat (limited to 'source/blender/bmesh/tools/bmesh_decimate_collapse.c')
| -rw-r--r-- | source/blender/bmesh/tools/bmesh_decimate_collapse.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/source/blender/bmesh/tools/bmesh_decimate_collapse.c b/source/blender/bmesh/tools/bmesh_decimate_collapse.c index 85402544396..230cb302d28 100644 --- a/source/blender/bmesh/tools/bmesh_decimate_collapse.c +++ b/source/blender/bmesh/tools/bmesh_decimate_collapse.c @@ -527,7 +527,9 @@ static void bm_edge_collapse_loop_customdata(BMesh *bm, BMLoop *l, BMVert *v_cle /* detect seams */ if (CustomData_data_equals(type, cd_src[0], cd_iter)) { - CustomData_bmesh_interp_n(&bm->ldata, cd_src, w, NULL, 2, l_iter->head.data, i); + CustomData_bmesh_interp_n( + &bm->ldata, cd_src, w, NULL, ARRAY_SIZE(cd_src), + POINTER_OFFSET(l_iter->head.data, offset), i); #ifdef USE_SEAM is_seam = false; #endif |