correct assert for customdata overlap, also quiet uninitialized warning in transform.

This commit is contained in:
Campbell Barton
2012-08-24 08:17:53 +00:00
parent cfd21c7852
commit 93d89ec768
2 changed files with 6 additions and 1 deletions

View File

@@ -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];
}

View File

@@ -208,6 +208,11 @@ void convertViewVec(TransInfo *t, float r_vec[3], int dx, int dy)
/* TODO - NOT WORKING, this isnt so bad since its only display aspect */
ED_space_clip_get_aspect(t->sa->spacedata.first, &aspx, &aspy);
}
else {
/* should never happen, quiet warnings */
BLI_assert(0);
aspx = aspy = 1.0f;
}
r_vec[0] *= aspx;
r_vec[1] *= aspy;