diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2012-08-24 12:17:53 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2012-08-24 12:17:53 +0400 |
| commit | 93d89ec7683af9daf989fa643be3edceb1615ba1 (patch) | |
| tree | b7be8107af3236aa5875ae7fb0ecc74842fcfa00 /source/blender/blenkernel/intern/customdata.c | |
| parent | cfd21c7852dd29d8e58fd77ce4221598442efe7c (diff) | |
correct assert for customdata overlap, also quiet `uninitialized` warning in transform.
Diffstat (limited to 'source/blender/blenkernel/intern/customdata.c')
| -rw-r--r-- | source/blender/blenkernel/intern/customdata.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/blenkernel/intern/customdata.c b/source/blender/blenkernel/intern/customdata.c index c55f1b551e2..36c571a53ce 100644 --- a/source/blender/blenkernel/intern/customdata.c +++ b/source/blender/blenkernel/intern/customdata.c @@ -2018,7 +2018,7 @@ void CustomData_interp(const CustomData *source, CustomData *dest, for (j = 0; j < count; ++j) { /* if this happens we need to do a temp copy, see: USE_INTERP_OVERLAP_FIX */ - BLI_assert(dest_index != src_indices[j]); + BLI_assert(((source == dest) && (dest_index == src_indices[j])) == FALSE); sources[j] = (char *)src_data + typeInfo->size * src_indices[j]; } |