blender
/
blender
129
398
Fork 572
Code Issues 6.2k Pull Requests 747 Projects 19 Wiki Activity

Cleanup

This commit is contained in:
Campbell Barton 2015-04-25 12:29:52 +10:00
parent 3bffcc675b
commit 86d3a1f683
2 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
source/blender/editors/include/ED_mesh.h
View File

@ -144,7 +144,7 @@ struct BMVert *EDBM_vert_find_nearest(
struct ViewContext *vc, float *r_dist);
struct BMEdge *EDBM_edge_find_nearest_ex(
struct ViewContext *vc,float *r_dist,
struct ViewContext *vc, float *r_dist,
float *r_dist_center,
const bool use_select_bias, const bool use_cycle,
struct BMEdge **r_eed_zbuf);

12
source/blender/editors/mesh/editmesh_knife.c
View File

@ -1320,8 +1320,9 @@ static BMElem *bm_elem_from_knife_edge(KnifeEdge *kfe)
}
/* Do edges e1 and e2 go between exactly the same coordinates? */
static bool coinciding_edges(BMEdge *e1, BMEdge *e2) {
float *co11, *co12, *co21, *co22;
static bool coinciding_edges(BMEdge *e1, BMEdge *e2)
{
const float *co11, *co12, *co21, *co22;
co11 = e1->v1->co;
co12 = e1->v2->co;
@ -1329,9 +1330,12 @@ static bool coinciding_edges(BMEdge *e1, BMEdge *e2) {
co22 = e2->v2->co;
if ((equals_v3v3(co11, co21) && equals_v3v3(co12, co22)) ||
(equals_v3v3(co11, co22) && equals_v3v3(co12, co21)))
{
return true;
else
}
else {
return false;
}
}
/* Callback used in point_is_visible to exclude hits on the faces that are the same
@ -1354,7 +1358,7 @@ static bool bm_ray_cast_cb_elem_not_in_face_check(BMFace *f, void *user_data)
ans = !BM_edge_in_face(e, f);
if (ans) {
/* Is it a boundary edge, coincident with a split edge? */
if (BM_edge_face_count(e) == 1) {
if (BM_edge_is_boundary(e)) {
BM_ITER_ELEM(e2, &iter, f, BM_EDGES_OF_FACE) {
if (coinciding_edges(e, e2)) {
ans = false;