From dcf2a071a008787946d6a15f134c012570e17a48 Mon Sep 17 00:00:00 2001 From: Sergey Sharybin Date: Wed, 28 May 2014 18:44:15 +0600 Subject: Fix mask transform when display aspect is not 1:1 Requires some more intense testing. --- source/blender/editors/transform/transform_generics.c | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) (limited to 'source/blender/editors/transform/transform_generics.c') diff --git a/source/blender/editors/transform/transform_generics.c b/source/blender/editors/transform/transform_generics.c index 4b01f620410..6eb88212714 100644 --- a/source/blender/editors/transform/transform_generics.c +++ b/source/blender/editors/transform/transform_generics.c @@ -1567,19 +1567,14 @@ void calculateCenterCursor2D(TransInfo *t, float r_center[2]) if (cursor) { if (t->options & CTX_MASK) { float co[2]; - float frame_size[2]; if (t->spacetype == SPACE_IMAGE) { SpaceImage *sima = (SpaceImage *)t->sa->spacedata.first; - ED_space_image_get_size_fl(sima, frame_size); - BKE_mask_coord_from_frame(co, cursor, frame_size); - ED_space_image_get_aspect(sima, &aspx, &aspy); + BKE_mask_coord_from_image(sima->image, &sima->iuser, co, cursor); } else if (t->spacetype == SPACE_CLIP) { SpaceClip *space_clip = (SpaceClip *) t->sa->spacedata.first; - ED_space_clip_get_size_fl(space_clip, frame_size); - BKE_mask_coord_from_frame(co, cursor, frame_size); - ED_space_clip_get_aspect(space_clip, &aspx, &aspy); + BKE_mask_coord_from_movieclip(space_clip->clip, &space_clip->user, co, cursor); } else { BLI_assert(!"Shall not happen"); -- cgit v1.2.3