kannonier8/blender
1
0
Fork 0
forked from bartvdbraak/blender
Code Pull Requests Activity

rename BM_edge_calc_squared_length -> BM_edge_calc_length_squared, matching len_v3, len_squared_v3

Browse Source
This commit is contained in:
Campbell Barton 2012-12-31 02:40:15 +00:00
parent 1aebc0e790
commit 827f9aa737
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
source/blender/blenkernel/intern/pbvh_bmesh.c
View File

@ -532,7 +532,7 @@ static void edge_queue_insert(EdgeQueue *q, BLI_mempool *pool, BMEdge *e,
static void long_edge_queue_edge_add(EdgeQueue *q, BLI_mempool *pool,
BMEdge *e)
{
const float len_sq = BM_edge_calc_squared_length(e);
const float len_sq = BM_edge_calc_length_squared(e);
if (len_sq > q->limit_len_squared)
edge_queue_insert(q, pool, e, 1.0f / len_sq);
}
@ -540,7 +540,7 @@ static void long_edge_queue_edge_add(EdgeQueue *q, BLI_mempool *pool,
static void short_edge_queue_edge_add(EdgeQueue *q, BLI_mempool *pool,
BMEdge *e)
{
const float len_sq = BM_edge_calc_squared_length(e);
const float len_sq = BM_edge_calc_length_squared(e);
if (len_sq < q->limit_len_squared)
edge_queue_insert(q, pool, e, len_sq);
}
@ -762,7 +762,7 @@ static int pbvh_bmesh_subdivide_long_edges(PBVH *bvh, EdgeQueue *q,
continue;
}
if (BM_edge_calc_squared_length(e) <= q->limit_len_squared)
if (BM_edge_calc_length_squared(e) <= q->limit_len_squared)
continue;
any_subdivided = TRUE;
@ -925,7 +925,7 @@ static int pbvh_bmesh_collapse_short_edges(PBVH *bvh, EdgeQueue *q,
continue;
}
if (BM_edge_calc_squared_length(e) >= min_len_squared)
if (BM_edge_calc_length_squared(e) >= min_len_squared)
continue;
any_collapsed = TRUE;

2
source/blender/bmesh/intern/bmesh_queries.c
View File

@ -478,7 +478,7 @@ float BM_edge_calc_length(BMEdge *e)
/**
* Returns edge length squared (for comparisons)
*/
float BM_edge_calc_squared_length(BMEdge *e)
float BM_edge_calc_length_squared(BMEdge *e)
{
return len_squared_v3v3(e->v1->co, e->v2->co);
}

2
source/blender/bmesh/intern/bmesh_queries.h
View File

@ -37,7 +37,7 @@ int BM_vert_in_edge(BMEdge *e, BMVert *v);
int BM_verts_in_edge(BMVert *v1, BMVert *v2, BMEdge *e);
float BM_edge_calc_length(BMEdge *e);
float BM_edge_calc_squared_length(BMEdge *e);
float BM_edge_calc_length_squared(BMEdge *e);
int BM_edge_face_pair(BMEdge *e, BMFace **r_fa, BMFace **r_fb);
int BM_edge_loop_pair(BMEdge *e, BMLoop **r_la, BMLoop **r_lb);
BMVert *BM_edge_other_vert(BMEdge *e, BMVert *v);