Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCampbell Barton <ideasman42@gmail.com>2012-09-13 09:29:38 +0400
committerCampbell Barton <ideasman42@gmail.com>2012-09-13 09:29:38 +0400
commit05755d307a140934aba98e55e9c7536c0cba0947 (patch)
treeadb0988fa03ea2ae11d785e78a164d4c90e82df2 /source/blender/editors/mask/mask_edit.c
parentc5310521f8d9099fc36431bae76dd0a402cc077e (diff)
fix [#31946] Masking doesn't respect pixel ratio
Diffstat (limited to 'source/blender/editors/mask/mask_edit.c')
-rw-r--r--source/blender/editors/mask/mask_edit.c13
1 files changed, 3 insertions, 10 deletions
diff --git a/source/blender/editors/mask/mask_edit.c b/source/blender/editors/mask/mask_edit.c
index 85a8ae11111..39a19bdaa5f 100644
--- a/source/blender/editors/mask/mask_edit.c
+++ b/source/blender/editors/mask/mask_edit.c
@@ -109,11 +109,9 @@ void ED_mask_mouse_pos(ScrArea *sa, ARegion *ar, const int mval[2], float co[2])
}
case SPACE_IMAGE:
{
- float frame_size[2];
SpaceImage *sima = sa->spacedata.first;
- ED_space_image_get_size_fl(sima, frame_size);
ED_image_mouse_pos(sima, ar, mval, co);
- BKE_mask_coord_from_frame(co, co, frame_size);
+ BKE_mask_coord_from_image(sima->image, &sima->iuser, co, co);
break;
}
default:
@@ -149,11 +147,9 @@ void ED_mask_point_pos(ScrArea *sa, ARegion *ar, float x, float y, float *xr, fl
break;
case SPACE_IMAGE:
{
- float frame_size[2];
SpaceImage *sima = sa->spacedata.first;
- ED_space_image_get_size_fl(sima, frame_size);
ED_image_point_pos(sima, ar, x, y, &co[0], &co[1]);
- BKE_mask_coord_from_frame(co, co, frame_size);
+ BKE_mask_coord_from_image(sima->image, &sima->iuser, co, co);
break;
}
default:
@@ -192,13 +188,10 @@ void ED_mask_point_pos__reverse(ScrArea *sa, ARegion *ar, float x, float y, floa
break;
case SPACE_IMAGE:
{
- float frame_size[2];
SpaceImage *sima = sa->spacedata.first;
- ED_space_image_get_size_fl(sima, frame_size);
-
co[0] = x;
co[1] = y;
- BKE_mask_coord_to_frame(co, co, frame_size);
+ BKE_mask_coord_to_image(sima->image, &sima->iuser, co, co);
ED_image_point_pos__reverse(sima, ar, co, co);
break;
}