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/intern/bmesh_interp.h | |
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/intern/bmesh_interp.h')
-rw-r--r-- | source/blender/bmesh/intern/bmesh_interp.h | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/source/blender/bmesh/intern/bmesh_interp.h b/source/blender/bmesh/intern/bmesh_interp.h index 3be6dcdace3..117333b52e3 100644 --- a/source/blender/bmesh/intern/bmesh_interp.h +++ b/source/blender/bmesh/intern/bmesh_interp.h @@ -54,8 +54,13 @@ void BM_loop_interp_from_face(BMesh *bm, BMLoop *target, BMFace *source, const bool do_vertex, const bool do_multires); void BM_face_multires_bounds_smooth(BMesh *bm, BMFace *f); -struct LinkNode *BM_vert_loop_groups_data_layer_create(BMesh *bm, BMVert *v, int layer_n, struct MemArena *arena); -void BM_vert_loop_groups_data_layer_merge(BMesh *bm, struct LinkNode *groups, int layer_n); -void BM_vert_loop_groups_data_layer_merge_weights(BMesh *bm, struct LinkNode *groups, int layer_n, const float *loop_weights); + +struct LinkNode *BM_vert_loop_groups_data_layer_create( + BMesh *bm, BMVert *v, const int layer_n, struct MemArena *arena); +void BM_vert_loop_groups_data_layer_merge( + BMesh *bm, struct LinkNode *groups, const int layer_n); +void BM_vert_loop_groups_data_layer_merge_weights( + BMesh *bm, struct LinkNode *groups, const int layer_n, + const float *loop_weights); #endif /* __BMESH_INTERP_H__ */ |