diff options
author | Campbell Barton <ideasman42@gmail.com> | 2017-08-05 00:53:07 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2017-08-05 00:53:07 +0300 |
commit | 48adef4444a8276ce1d89b122346ae0426493574 (patch) | |
tree | 745c37121fbfb353531382b19be2ce1922f9ecbb /source/blender/editors/include/ED_view3d.h | |
parent | 796437247f87852026b9632f520bdcf071340b86 (diff) | |
parent | fa05718f278d6810356e64fafcf32c6222d67aab (diff) |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/editors/include/ED_view3d.h')
-rw-r--r-- | source/blender/editors/include/ED_view3d.h | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/source/blender/editors/include/ED_view3d.h b/source/blender/editors/include/ED_view3d.h index f34afd176e1..4b7eaa4f3d4 100644 --- a/source/blender/editors/include/ED_view3d.h +++ b/source/blender/editors/include/ED_view3d.h @@ -110,7 +110,14 @@ void ED_view3d_lastview_store(struct RegionView3D *rv3d); /* Depth buffer */ void ED_view3d_depth_update(struct ARegion *ar); -float ED_view3d_depth_read_cached(const struct ViewContext *vc, int x, int y); +float ED_view3d_depth_read_cached(const struct ViewContext *vc, const int mval[2]); +bool ED_view3d_depth_read_cached_normal( + const ViewContext *vc, const int mval[2], + float r_normal[3]); +bool ED_view3d_depth_unproject( + const struct ARegion *ar, + const int mval[2], const double depth, + float r_location_world[3]); void ED_view3d_depth_tag_update(struct RegionView3D *rv3d); /* Projection */ |