diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2018-09-20 05:04:18 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2018-09-20 05:05:10 +0300 |
| commit | 1a2e41a0f2499aa0339ceb49f199c28722e840dc (patch) | |
| tree | 7b8ff1f5da52dce7b476432a7746415f96152347 /source/blender/editors/mesh | |
| parent | 65fb2ebb3c23432e16464db9246d292773d639b5 (diff) | |
Cleanup: renaming missed from merge
Diffstat (limited to 'source/blender/editors/mesh')
| -rw-r--r-- | source/blender/editors/mesh/editmesh_add_gizmo.c | 2 | ||||
| -rw-r--r-- | source/blender/editors/mesh/editmesh_knife.c | 4 | ||||
| -rw-r--r-- | source/blender/editors/mesh/editmesh_select.c | 2 | ||||
| -rw-r--r-- | source/blender/editors/mesh/editmesh_utils.c | 2 |
4 files changed, 5 insertions, 5 deletions
diff --git a/source/blender/editors/mesh/editmesh_add_gizmo.c b/source/blender/editors/mesh/editmesh_add_gizmo.c index d56d9513fc8..4e8985d2a9b 100644 --- a/source/blender/editors/mesh/editmesh_add_gizmo.c +++ b/source/blender/editors/mesh/editmesh_add_gizmo.c @@ -100,7 +100,7 @@ static void calc_initial_placement_point_from_view( if (use_mouse_project) { float ray_co[3], ray_no[3]; - if (ED_view3d_win_to_ray( + if (ED_view3d_win_to_ray_clipped( CTX_data_depsgraph(C), ar, v3d, mval, ray_co, ray_no, false)) diff --git a/source/blender/editors/mesh/editmesh_knife.c b/source/blender/editors/mesh/editmesh_knife.c index 44eceba2ec1..e2f13139718 100644 --- a/source/blender/editors/mesh/editmesh_knife.c +++ b/source/blender/editors/mesh/editmesh_knife.c @@ -1572,8 +1572,8 @@ static void knife_find_line_hits(KnifeTool_OpData *kcd) } /* unproject screen line */ - ED_view3d_win_to_segment(kcd->vc.depsgraph, kcd->ar, kcd->vc.v3d, s1, v1, v3, true); - ED_view3d_win_to_segment(kcd->vc.depsgraph, kcd->ar, kcd->vc.v3d, s2, v2, v4, true); + ED_view3d_win_to_segment_clipped(kcd->vc.depsgraph, kcd->ar, kcd->vc.v3d, s1, v1, v3, true); + ED_view3d_win_to_segment_clipped(kcd->vc.depsgraph, kcd->ar, kcd->vc.v3d, s2, v2, v4, true); mul_m4_v3(kcd->ob->imat, v1); mul_m4_v3(kcd->ob->imat, v2); diff --git a/source/blender/editors/mesh/editmesh_select.c b/source/blender/editors/mesh/editmesh_select.c index ce564e10e60..311df0a54c6 100644 --- a/source/blender/editors/mesh/editmesh_select.c +++ b/source/blender/editors/mesh/editmesh_select.c @@ -1118,7 +1118,7 @@ bool EDBM_unified_findnearest_from_raycast( BMElem *ele; } best = {0, NULL}; - if (ED_view3d_win_to_ray( + if (ED_view3d_win_to_ray_clipped( vc->depsgraph, vc->ar, vc->v3d, mval_fl, ray_origin, ray_direction, true)) diff --git a/source/blender/editors/mesh/editmesh_utils.c b/source/blender/editors/mesh/editmesh_utils.c index fd87ba32653..d5b83b71bc3 100644 --- a/source/blender/editors/mesh/editmesh_utils.c +++ b/source/blender/editors/mesh/editmesh_utils.c @@ -1502,7 +1502,7 @@ bool BMBVH_EdgeVisible(struct BMBVHTree *tree, BMEdge *e, ar->winy / 2.0f, }; - ED_view3d_win_to_segment(depsgraph, ar, v3d, mval_f, origin, end, false); + ED_view3d_win_to_segment_clipped(depsgraph, ar, v3d, mval_f, origin, end, false); invert_m4_m4(invmat, obedit->obmat); mul_m4_v3(invmat, origin); |