diff options
author | Campbell Barton <ideasman42@gmail.com> | 2015-11-03 12:30:54 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2015-11-03 12:38:23 +0300 |
commit | bed91b623f0a4511c0c163805bb253377d407765 (patch) | |
tree | bad23c2928882ff3db8fd1f71f1988ad05df0c73 /source/blender/bmesh/intern/bmesh_interp.c | |
parent | f29f4c92f2b10e9707be151750dcbbba244f862b (diff) |
Edge/Vert slide: improve multires interpolation
Need to re-interpolate the entire face, not just the connected loop.
Also add BM_face_interp_multires()
Diffstat (limited to 'source/blender/bmesh/intern/bmesh_interp.c')
-rw-r--r-- | source/blender/bmesh/intern/bmesh_interp.c | 25 |
1 files changed, 25 insertions, 0 deletions
diff --git a/source/blender/bmesh/intern/bmesh_interp.c b/source/blender/bmesh/intern/bmesh_interp.c index d74e5de6dd8..9925e155e62 100644 --- a/source/blender/bmesh/intern/bmesh_interp.c +++ b/source/blender/bmesh/intern/bmesh_interp.c @@ -527,6 +527,31 @@ void BM_loop_interp_multires(BMesh *bm, BMLoop *l_dst, const BMFace *f_src) BM_loop_interp_multires_ex(bm, l_dst, f_src, f_dst_center, f_src_center, cd_loop_mdisp_offset); } +void BM_face_interp_multires_ex( + BMesh *bm, BMFace *f_dst, const BMFace *f_src, + const float f_dst_center[3], const float f_src_center[3], const int cd_loop_mdisp_offset) +{ + BMLoop *l_iter, *l_first; + l_iter = l_first = BM_FACE_FIRST_LOOP(f_dst); + do { + BM_loop_interp_multires_ex( + bm, l_iter, f_src, + f_dst_center, f_src_center, cd_loop_mdisp_offset); + } while ((l_iter = l_iter->next) != l_first); +} + +void BM_face_interp_multires(BMesh *bm, BMFace *f_dst, const BMFace *f_src) +{ + const int cd_loop_mdisp_offset = CustomData_get_offset(&bm->ldata, CD_MDISPS); + float f_dst_center[3]; + float f_src_center[3]; + + BM_face_calc_center_mean(f_dst, f_dst_center); + BM_face_calc_center_mean(f_src, f_src_center); + + BM_face_interp_multires_ex(bm, f_dst, f_src, f_dst_center, f_src_center, cd_loop_mdisp_offset); +} + /** * smooths boundaries between multires grids, * including some borders in adjacent faces |