diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2018-06-17 12:57:49 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2018-06-17 12:57:49 +0300 |
| commit | 43ce201125ff97e16a56b372a91442590498dacc (patch) | |
| tree | 10b6ef3c41cab5b9cef0b93d99de0a14fca4157f /source/blender/bmesh/tools/bmesh_intersect.c | |
| parent | 75188552a113f4dc226f21076f883ac3c11c9a98 (diff) | |
| parent | 42103a3eb8e9ee341c89310cc2343bc21b6ae7e2 (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/bmesh/tools/bmesh_intersect.c')
| -rw-r--r-- | source/blender/bmesh/tools/bmesh_intersect.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/bmesh/tools/bmesh_intersect.c b/source/blender/bmesh/tools/bmesh_intersect.c index fba2aac087b..a35bb81a1c2 100644 --- a/source/blender/bmesh/tools/bmesh_intersect.c +++ b/source/blender/bmesh/tools/bmesh_intersect.c @@ -1223,7 +1223,7 @@ bool BM_mesh_intersect( if (BM_vert_in_edge(e, v_prev)) { BMEdge *e_split; - v_prev = BM_edge_split(bm, e, v_prev, &e_split, CLAMPIS(fac, 0.0f, 1.0f)); + v_prev = BM_edge_split(bm, e, v_prev, &e_split, clamp_f(fac, 0.0f, 1.0f)); BLI_assert(BM_vert_in_edge(e, v_end)); if (!BM_edge_exists(v_prev, vi) && |