From 21280a638639d35b3e06c8a452f1aba755b9ea08 Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Fri, 2 Mar 2012 12:44:34 +0000 Subject: Code Cleanup - naming consistancy for bmesh struct types --- source/blender/bmesh/operators/bmo_dissolve.c | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) (limited to 'source/blender/bmesh/operators/bmo_dissolve.c') diff --git a/source/blender/bmesh/operators/bmo_dissolve.c b/source/blender/bmesh/operators/bmo_dissolve.c index 162992f7df8..9e07cb177dd 100644 --- a/source/blender/bmesh/operators/bmo_dissolve.c +++ b/source/blender/bmesh/operators/bmo_dissolve.c @@ -324,13 +324,11 @@ static int test_extra_verts(BMesh *bm, BMVert *v) } void bmo_dissolve_verts_exec(BMesh *bm, BMOperator *op) { - BMOpSlot *vinput; BMIter iter, fiter; BMVert *v; BMFace *f; /* int i; */ - - vinput = BMO_slot_get(op, "verts"); + BMO_slot_buffer_flag_enable(bm, op, "verts", VERT_MARK, BM_VERT); for (v = BM_iter_new(&iter, bm, BM_VERTS_OF_MESH, NULL); v; v = BM_iter_step(&iter)) { @@ -468,14 +466,14 @@ void dummy_exec(BMesh *bm, BMOperator *op) #endif /**/ -typedef struct DissolveElemWeight_t { +typedef struct DissolveElemWeight { BMHeader *ele; float weight; -} DissolveElemWeight_t; +} DissolveElemWeight; static int dissolve_elem_cmp(const void *a1, const void *a2) { - const struct DissolveElemWeight_t *d1 = a1, *d2 = a2; + const struct DissolveElemWeight *d1 = a1, *d2 = a2; if (d1->weight > d2->weight) return 1; else if (d1->weight < d2->weight) return -1; @@ -488,8 +486,8 @@ void bmo_dissolve_limit_exec(BMesh *bm, BMOperator *op) BMOpSlot *vinput = BMO_slot_get(op, "verts"); const float angle_max = (float)M_PI / 2.0f; const float angle_limit = minf(angle_max, BMO_slot_float_get(op, "angle_limit")); - DissolveElemWeight_t *weight_elems = MEM_mallocN(MAX2(einput->len, vinput->len) * - sizeof(DissolveElemWeight_t), __func__); + DissolveElemWeight *weight_elems = MEM_mallocN(MAX2(einput->len, vinput->len) * + sizeof(DissolveElemWeight), __func__); int i, tot_found; /* --- first edges --- */ @@ -511,7 +509,7 @@ void bmo_dissolve_limit_exec(BMesh *bm, BMOperator *op) } if (tot_found != 0) { - qsort(weight_elems, einput->len, sizeof(DissolveElemWeight_t), dissolve_elem_cmp); + qsort(weight_elems, einput->len, sizeof(DissolveElemWeight), dissolve_elem_cmp); for (i = 0; i < tot_found; i++) { BMEdge *e = (BMEdge *)weight_elems[i].ele; @@ -546,7 +544,7 @@ void bmo_dissolve_limit_exec(BMesh *bm, BMOperator *op) } if (tot_found != 0) { - qsort(weight_elems, vinput->len, sizeof(DissolveElemWeight_t), dissolve_elem_cmp); + qsort(weight_elems, vinput->len, sizeof(DissolveElemWeight), dissolve_elem_cmp); for (i = 0; i < tot_found; i++) { BMVert *v = (BMVert *)weight_elems[i].ele; -- cgit v1.2.3