diff options
author | Campbell Barton <ideasman42@gmail.com> | 2012-04-23 05:19:50 +0400 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2012-04-23 05:19:50 +0400 |
commit | 16ff7e40e66f93484695445b89090547de78d086 (patch) | |
tree | 606e56eea7e492173372d06a0db83f0f3e08da0c /source/blender/bmesh/operators/bmo_dissolve.c | |
parent | c498c0eb4283473e719c5696843941051f9deed3 (diff) |
code cleanup: change C naming convention (so py and C api match), eg:
C: BM_face_calc_area(f), Py: BMFace.calc_area()
Diffstat (limited to 'source/blender/bmesh/operators/bmo_dissolve.c')
-rw-r--r-- | source/blender/bmesh/operators/bmo_dissolve.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/source/blender/bmesh/operators/bmo_dissolve.c b/source/blender/bmesh/operators/bmo_dissolve.c index fe9e40aad44..8e7723fefdd 100644 --- a/source/blender/bmesh/operators/bmo_dissolve.c +++ b/source/blender/bmesh/operators/bmo_dissolve.c @@ -486,10 +486,10 @@ void dummy_exec(BMesh *bm, BMOperator *op) * convert angles [0-PI/2] -> [0-1], multiply together, then convert back to radians. */ float bm_vert_edge_face_angle(BMVert *v) { - const float angle = BM_vert_edge_angle(v); + const float angle = BM_vert_calc_edge_angle(v); /* note: could be either edge, it doesn't matter */ if (v->e && BM_edge_is_manifold(v->e)) { - return ((angle * ANGLE_TO_UNIT) * (BM_edge_face_angle(v->e) * ANGLE_TO_UNIT)) * UNIT_TO_ANGLE; + return ((angle * ANGLE_TO_UNIT) * (BM_edge_calc_face_angle(v->e) * ANGLE_TO_UNIT)) * UNIT_TO_ANGLE; } else { return angle; @@ -528,7 +528,7 @@ void bmo_dissolve_limit_exec(BMesh *bm, BMOperator *op) /* go through and split edge */ for (i = 0, tot_found = 0; i < einput->len; i++) { BMEdge *e = ((BMEdge **)einput->data.p)[i]; - const float angle = BM_edge_face_angle(e); + const float angle = BM_edge_calc_face_angle(e); if (angle < angle_limit) { tot_found++; @@ -546,7 +546,7 @@ void bmo_dissolve_limit_exec(BMesh *bm, BMOperator *op) if (/* may have become non-manifold */ BM_edge_is_manifold(e) && /* check twice because cumulative effect could dissolve over angle limit */ - (BM_edge_face_angle(e) < angle_limit)) + (BM_edge_calc_face_angle(e) < angle_limit)) { BMFace *nf = BM_faces_join_pair(bm, e->l->f, e->l->radial_next->f, |