From 4f044f4ec1b682fb5b13f5aa62201314d855477b Mon Sep 17 00:00:00 2001 From: Sergey Sharybin Date: Tue, 19 Jun 2012 14:26:29 +0000 Subject: Changes in clip editor's public api to make it's more clear whether getting of some property happens or this property is being changed. Also made it more clear whether affecting property belongs to clip or mask datablock. --- source/blender/editors/mask/mask_edit.c | 10 +++++----- source/blender/editors/mask/mask_select.c | 4 ++-- 2 files changed, 7 insertions(+), 7 deletions(-) (limited to 'source/blender/editors/mask') diff --git a/source/blender/editors/mask/mask_edit.c b/source/blender/editors/mask/mask_edit.c index 3396f664820..fdf72043464 100644 --- a/source/blender/editors/mask/mask_edit.c +++ b/source/blender/editors/mask/mask_edit.c @@ -138,7 +138,7 @@ void ED_mask_size(const bContext *C, int *width, int *height) if (sa && sa->spacedata.first) { if (sa->spacetype == SPACE_CLIP) { SpaceClip *sc = sa->spacedata.first; - ED_space_clip_mask_size(sc, width, height); + ED_space_clip_get_mask_size(sc, width, height); return; } else if (sa->spacetype == SPACE_SEQ) { @@ -159,7 +159,7 @@ void ED_mask_aspect(const bContext *C, float *aspx, float *aspy) SpaceClip *sc = CTX_wm_space_clip(C); if (sc) { - ED_space_clip_mask_aspect(sc, aspx, aspy); + ED_space_clip_get_mask_aspect(sc, aspx, aspy); } else { /* possible other spaces from which mask editing is available */ @@ -177,9 +177,9 @@ void ED_mask_pixelspace_factor(const bContext *C, float *scalex, float *scaley) int width, height; float zoomx, zoomy, aspx, aspy; - ED_space_clip_size(sc, &width, &height); - ED_space_clip_zoom(sc, ar, &zoomx, &zoomy); - ED_space_clip_aspect(sc, &aspx, &aspy); + ED_space_clip_get_clip_size(sc, &width, &height); + ED_space_clip_get_zoom(sc, ar, &zoomx, &zoomy); + ED_space_clip_get_clip_aspect(sc, &aspx, &aspy); *scalex = ((float)width * aspx) * zoomx; *scaley = ((float)height * aspy) * zoomy; diff --git a/source/blender/editors/mask/mask_select.c b/source/blender/editors/mask/mask_select.c index 55e09529320..e34823278cb 100644 --- a/source/blender/editors/mask/mask_select.c +++ b/source/blender/editors/mask/mask_select.c @@ -595,8 +595,8 @@ static int circle_select_exec(bContext *C, wmOperator *op) /* TODO - make generic! - this is SpaceClip only! */ /* compute ellipse and position in unified coordinates */ - ED_space_clip_size(sc, &width, &height); - ED_space_clip_zoom(sc, ar, &zoomx, &zoomy); + ED_space_clip_get_clip_size(sc, &width, &height); + ED_space_clip_get_zoom(sc, ar, &zoomx, &zoomy); width = height = MAX2(width, height); ellipse[0] = width * zoomx / radius; -- cgit v1.2.3