archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

Fix error in recent vert/edge-slide commits

Browse Source 
`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.
This commit is contained in:
Campbell Barton
2015-02-23 13:43:09 +11:00
parent 50c977b54d
commit 5a372dbd89
6 changed files with 75 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
source/blender/blenkernel/BKE_customdata.h
View File

@@ -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