diff options
author | Campbell Barton <ideasman42@gmail.com> | 2017-08-29 12:38:01 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2017-08-29 12:38:01 +0300 |
commit | 6b8132a153d0bad697005d1d93c9827c2be8a273 (patch) | |
tree | fc8b8620807dd61ace254192b2bd969b7e5d4bbf /source/blender/editors/include | |
parent | 3d56bfbc8252dd371853f4a34eb29a67cd29337f (diff) | |
parent | c7f106cbe22e0cf000a35dda7adff7d596843cc5 (diff) |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/editors/include')
-rw-r--r-- | source/blender/editors/include/UI_view2d.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/source/blender/editors/include/UI_view2d.h b/source/blender/editors/include/UI_view2d.h index 4caacb65f5f..4c0493a881c 100644 --- a/source/blender/editors/include/UI_view2d.h +++ b/source/blender/editors/include/UI_view2d.h @@ -203,6 +203,7 @@ bool UI_view2d_view_to_region_clip(struct View2D *v2d, float x, float y, int *r void UI_view2d_view_to_region(struct View2D *v2d, float x, float y, int *r_region_x, int *r_region_y) ATTR_NONNULL(); void UI_view2d_view_to_region_fl(struct View2D *v2d, float x, float y, float *r_region_x, float *r_region_y) ATTR_NONNULL(); +void UI_view2d_view_to_region_m4(struct View2D *v2d, float matrix[4][4]) ATTR_NONNULL(); void UI_view2d_view_to_region_rcti(struct View2D *v2d, const struct rctf *rect_src, struct rcti *rect_dst) ATTR_NONNULL(); bool UI_view2d_view_to_region_rcti_clip(struct View2D *v2d, const struct rctf *rect_src, struct rcti *rect_dst) ATTR_NONNULL(); |