diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2018-09-20 05:46:04 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2018-09-20 05:51:16 +0300 |
| commit | 9dac8633d6dd7616cfd1beca6079156e95b0f15b (patch) | |
| tree | d2bac0731c919d839b56abad1d7183732c3bae29 /source/blender/editors/space_view3d/view3d_project.c | |
| parent | 66720194840b11bdfb0f26e4191d1f214cdc2e8e (diff) | |
| parent | 1cc9022eb51b73abc84d79366a9cf54a561c7520 (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/editors/space_view3d/view3d_project.c')
| -rw-r--r-- | source/blender/editors/space_view3d/view3d_project.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/source/blender/editors/space_view3d/view3d_project.c b/source/blender/editors/space_view3d/view3d_project.c index 6e8b7c281ce..116f4af34e5 100644 --- a/source/blender/editors/space_view3d/view3d_project.c +++ b/source/blender/editors/space_view3d/view3d_project.c @@ -559,14 +559,14 @@ void ED_view3d_win_to_3d_int( bool ED_view3d_win_to_3d_on_plane( const ARegion *ar, - const float plane[4], const float mval[2], + const float plane[4], const float mval[2], const bool do_clip, float r_out[3]) { float ray_co[3], ray_no[3]; ED_view3d_win_to_origin(ar, mval, ray_co); ED_view3d_win_to_vector(ar, mval, ray_no); float lambda; - if (isect_ray_plane_v3(ray_co, ray_no, plane, &lambda, false)) { + if (isect_ray_plane_v3(ray_co, ray_no, plane, &lambda, do_clip)) { madd_v3_v3v3fl(r_out, ray_co, ray_no, lambda); return true; } @@ -575,11 +575,11 @@ bool ED_view3d_win_to_3d_on_plane( bool ED_view3d_win_to_3d_on_plane_int( const ARegion *ar, - const float plane[4], const int mval[2], + const float plane[4], const int mval[2], const bool do_clip, float r_out[3]) { const float mval_fl[2] = {mval[0], mval[1]}; - return ED_view3d_win_to_3d_on_plane(ar, plane, mval_fl, r_out); + return ED_view3d_win_to_3d_on_plane(ar, plane, mval_fl, do_clip, r_out); } /** |