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

2 files changed, 6 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];
 			}
diff --git a/source/blender/editors/transform/transform.c b/source/blender/editors/transform/transform.c
index 284c670fa08..8259ca64bad 100644
--- a/source/blender/editors/transform/transform.c
+++ b/source/blender/editors/transform/transform.c
@@ -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;