diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2014-04-21 10:47:16 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2014-04-21 10:59:40 +0400 |
| commit | 9ae0e585b0aab466c978ec1a55c824d902faa3b4 (patch) | |
| tree | 6a99d63651f1b66ffacac2582b5f03d58898ad99 /source/blender/editors/mask | |
| parent | 6ee8670fca946d146332e80ceff29e459cd91ed5 (diff) | |
View2d: API Cleanup for view<->region conversion
View2D had some inconsistencies making it error prone in some cases.
- Inconstant checking for NULL x/y args.
Disallow NULL args for x/y destination pointers, instead add:
- UI_view2d_region_to_view_x/y
- UI_view2d_view_to_region_x/y
- '_no_clip' suffix wasn't always used for non-clipping conversion,
switch it around and use a '_clip' suffix for all funcs that clip.
- UI_view2d_text_cache_add now clips before adding cache.
- '_clip' funcs return a bool to quickly check if its in the view.
- add conversion for rectangles, since this is a common task:
- UI_view2d_view_to_region_rcti
- UI_view2d_region_to_view_rctf
Diffstat (limited to 'source/blender/editors/mask')
| -rw-r--r-- | source/blender/editors/mask/mask_draw.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/editors/mask/mask_draw.c b/source/blender/editors/mask/mask_draw.c index 08896b39682..35b14d1378d 100644 --- a/source/blender/editors/mask/mask_draw.c +++ b/source/blender/editors/mask/mask_draw.c @@ -738,7 +738,7 @@ void ED_mask_draw_region(Mask *mask, ARegion *ar, float xofs, yofs; /* find window pixel coordinates of origin */ - UI_view2d_to_region_no_clip(&ar->v2d, 0.0f, 0.0f, &x, &y); + UI_view2d_view_to_region(&ar->v2d, 0.0f, 0.0f, &x, &y); /* w = BLI_rctf_size_x(&v2d->tot); */ |