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/blenkernel/BKE_customdata.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/blenkernel/BKE_customdata.h')
-rw-r--r-- | source/blender/blenkernel/BKE_customdata.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/source/blender/blenkernel/BKE_customdata.h b/source/blender/blenkernel/BKE_customdata.h index 508784273bc..e2e4a7a08ec 100644 --- a/source/blender/blenkernel/BKE_customdata.h +++ b/source/blender/blenkernel/BKE_customdata.h @@ -204,7 +204,7 @@ void CustomData_copy_data(const struct CustomData *source, void CustomData_copy_data_named(const struct CustomData *source, struct CustomData *dest, int source_index, int dest_index, int count); -void CustomData_copy_elements(int type, void *source, void *dest, int count); +void CustomData_copy_elements(int type, void *src_data_ofs, void *dst_data_ofs, int count); void CustomData_bmesh_copy_data(const struct CustomData *source, struct CustomData *dest, void *src_block, void **dest_block); @@ -232,11 +232,11 @@ void CustomData_interp( int count, int dest_index); void CustomData_bmesh_interp_n( struct CustomData *data, const void **src_blocks, const float *weights, - const float *sub_weights, int count, void *dest_block_ofs, int n); + const float *sub_weights, int count, void *dst_block_ofs, int n); void CustomData_bmesh_interp( struct CustomData *data, const void **src_blocks, const float *weights, const float *sub_weights, int count, - void *dest_block); + void *dst_block); /* swaps the data in the element corners, to new corners with indices as |