change clip utility function arguments to take space data and region rather then the context.

this allows a fix to be applied that corrects the helper line in the image view when transforming a mask.

2 files changed, 4 insertions, 7 deletions

diff --git a/source/blender/editors/transform/transform.c b/source/blender/editors/transform/transform.c
index 4f26f563ac6..a49fa895e99 100644
--- a/source/blender/editors/transform/transform.c
+++ b/source/blender/editors/transform/transform.c
@@ -226,16 +226,13 @@ void projectIntView(TransInfo *t, const float vec[3], int adr[2])
 			project_int_noclip(t->ar, vec, adr);
 	}
 	else if (t->spacetype == SPACE_IMAGE) {
-#if 0
 		if (t->options & CTX_MASK) {
 			float v[2];
-			ED_mask_point_pos__reverse(t->context, vec[0], vec[1], &v[0], &v[1]);
+			ED_mask_point_pos__reverse(t->sa, t->ar, vec[0], vec[1], &v[0], &v[1]);
 			adr[0] = v[0];
 			adr[1] = v[1];
 		}
-		else
-#endif
-		{
+		else {
 			float aspx, aspy, v[2];
 
 			ED_space_image_get_uv_aspect(t->sa->spacedata.first, &aspx, &aspy);
diff --git a/source/blender/editors/transform/transform_conversions.c b/source/blender/editors/transform/transform_conversions.c
index 597be0fd33b..02101b9d02d 100644
--- a/source/blender/editors/transform/transform_conversions.c
+++ b/source/blender/editors/transform/transform_conversions.c
@@ -6230,7 +6230,7 @@ static void createTransMaskingData(bContext *C, TransInfo *t)
 		return;
 	}
 
-	ED_mask_aspect(C, &asp[0], &asp[1]);
+	ED_mask_get_aspect(t->sa, t->ar, &asp[0], &asp[1]);
 
 	t->total = (propmode) ? count : countsel;
 	td = t->data = MEM_callocN(t->total * sizeof(TransData), "TransObData(Mask Editing)");
@@ -6281,7 +6281,7 @@ void flushTransMasking(TransInfo *t)
 	int a;
 	float asp[2], inv[2];
 
-	ED_mask_aspect(t->context, &asp[0], &asp[1]);
+	ED_mask_get_aspect(t->sa, t->ar, &asp[0], &asp[1]);
 	inv[0] = 1.0f / asp[0];
 	inv[1] = 1.0f / asp[1];