diff options
author | Campbell Barton <ideasman42@gmail.com> | 2012-04-19 18:38:09 +0400 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2012-04-19 18:38:09 +0400 |
commit | b40476455ea41788741d45b6dc4c7ea219b59a61 (patch) | |
tree | f6626059ed524a458f6087f7bcb5a0e5cf729c51 /source/blender/bmesh/intern | |
parent | ac6b702c9326df0ba55b8bc02a149b92e7119b09 (diff) |
code cleanup: remove unused BMesh args.
Diffstat (limited to 'source/blender/bmesh/intern')
-rw-r--r-- | source/blender/bmesh/intern/bmesh_core.c | 98 | ||||
-rw-r--r-- | source/blender/bmesh/intern/bmesh_interp.c | 8 | ||||
-rw-r--r-- | source/blender/bmesh/intern/bmesh_marking.c | 30 | ||||
-rw-r--r-- | source/blender/bmesh/intern/bmesh_marking.h | 10 | ||||
-rw-r--r-- | source/blender/bmesh/intern/bmesh_mesh.c | 2 | ||||
-rw-r--r-- | source/blender/bmesh/intern/bmesh_mesh_conv.c | 12 | ||||
-rw-r--r-- | source/blender/bmesh/intern/bmesh_mods.c | 27 | ||||
-rw-r--r-- | source/blender/bmesh/intern/bmesh_mods.h | 16 | ||||
-rw-r--r-- | source/blender/bmesh/intern/bmesh_operators_private.h | 10 | ||||
-rw-r--r-- | source/blender/bmesh/intern/bmesh_polygon.c | 37 | ||||
-rw-r--r-- | source/blender/bmesh/intern/bmesh_polygon.h | 18 | ||||
-rw-r--r-- | source/blender/bmesh/intern/bmesh_private.h | 8 | ||||
-rw-r--r-- | source/blender/bmesh/intern/bmesh_queries.c | 6 | ||||
-rw-r--r-- | source/blender/bmesh/intern/bmesh_queries.h | 4 |
14 files changed, 139 insertions, 147 deletions
diff --git a/source/blender/bmesh/intern/bmesh_core.c b/source/blender/bmesh/intern/bmesh_core.c index 01fe1c83bc0..76095728d5a 100644 --- a/source/blender/bmesh/intern/bmesh_core.c +++ b/source/blender/bmesh/intern/bmesh_core.c @@ -80,7 +80,7 @@ BMVert *BM_vert_create(BMesh *bm, const float co[3], const BMVert *example) BM_elem_attrs_copy(bm, bm, example, v); } - BM_CHECK_ELEMENT(bm, v); + BM_CHECK_ELEMENT(v); return v; } @@ -122,7 +122,7 @@ BMEdge *BM_edge_create(BMesh *bm, BMVert *v1, BMVert *v2, const BMEdge *example, if (example) BM_elem_attrs_copy(bm, bm, example, e); - BM_CHECK_ELEMENT(bm, e); + BM_CHECK_ELEMENT(e); return e; } @@ -314,12 +314,12 @@ BMFace *BM_face_create(BMesh *bm, BMVert **verts, BMEdge **edges, const int len, f->len = len; - BM_CHECK_ELEMENT(bm, f); + BM_CHECK_ELEMENT(f); return f; } -int bmesh_elem_check(BMesh *UNUSED(bm), void *element, const char htype) +int bmesh_elem_check(void *element, const char htype) { BMHeader *head = element; int err = 0; @@ -555,7 +555,7 @@ void BM_face_kill(BMesh *bm, BMFace *f) BMLoopList *ls, *ls_next; #endif - BM_CHECK_ELEMENT(bm, f); + BM_CHECK_ELEMENT(f); #ifdef USE_BMESH_HOLES for (ls = f->loops.first; ls; ls = ls_next) @@ -733,15 +733,15 @@ static int bm_loop_reverse_loop(BMesh *bm, BMFace *f /* validate radia */ for (i = 0, l_iter = l_first; i < len; i++, l_iter = l_iter->next) { - BM_CHECK_ELEMENT(bm, l_iter); - BM_CHECK_ELEMENT(bm, l_iter->e); - BM_CHECK_ELEMENT(bm, l_iter->v); - BM_CHECK_ELEMENT(bm, l_iter->f); + BM_CHECK_ELEMENT(l_iter); + BM_CHECK_ELEMENT(l_iter->e); + BM_CHECK_ELEMENT(l_iter->v); + BM_CHECK_ELEMENT(l_iter->f); } BLI_array_free(edar); - BM_CHECK_ELEMENT(bm, f); + BM_CHECK_ELEMENT(f); return 1; } @@ -755,7 +755,7 @@ int bmesh_loop_reverse(BMesh *bm, BMFace *f) #endif } -static void bm_elements_systag_enable(BMesh *UNUSED(bm), void *veles, int tot, int flag) +static void bm_elements_systag_enable(void *veles, int tot, int flag) { BMHeader **eles = veles; int i; @@ -765,7 +765,7 @@ static void bm_elements_systag_enable(BMesh *UNUSED(bm), void *veles, int tot, i } } -static void bm_elements_systag_disable(BMesh *UNUSED(bm), void *veles, int tot, int flag) +static void bm_elements_systag_disable(void *veles, int tot, int flag) { BMHeader **eles = veles; int i; @@ -893,7 +893,7 @@ BMFace *BM_faces_join(BMesh *bm, BMFace **faces, int totface, const short do_del if (totface == 1) return faces[0]; - bm_elements_systag_enable(bm, faces, totface, _FLAG_JF); + bm_elements_systag_enable(faces, totface, _FLAG_JF); for (i = 0; i < totface; i++) { f = faces[i]; @@ -1012,7 +1012,7 @@ BMFace *BM_faces_join(BMesh *bm, BMFace **faces, int totface, const short do_del } while ((l_iter = l_iter->next) != l_first); } - bm_elements_systag_disable(bm, faces, totface, _FLAG_JF); + bm_elements_systag_disable(faces, totface, _FLAG_JF); BM_ELEM_API_FLAG_DISABLE(newf, _FLAG_JF); /* handle multi-res data */ @@ -1046,11 +1046,11 @@ BMFace *BM_faces_join(BMesh *bm, BMFace **faces, int totface, const short do_del BLI_array_free(deledges); BLI_array_free(delverts); - BM_CHECK_ELEMENT(bm, newf); + BM_CHECK_ELEMENT(newf); return newf; error: - bm_elements_systag_disable(bm, faces, totface, _FLAG_JF); + bm_elements_systag_disable(faces, totface, _FLAG_JF); BLI_array_free(edges); BLI_array_free(deledges); BLI_array_free(delverts); @@ -1092,13 +1092,13 @@ static BMFace *bm_face_create__sfme(BMesh *bm, BMFace *UNUSED(example)) * \par Examples: * * Before: After: - * ---------- ---------- + * +--------+ +--------+ * | | | | * | | | f1 | * v1 f1 v2 v1======v2 * | | | f2 | * | | | | - * ---------- ---------- + * +--------+ +--------+ * * \note the input vertices can be part of the same edge. This will * result in a two edged face. This is desirable for advanced construction @@ -1243,9 +1243,9 @@ BMFace *bmesh_sfme(BMesh *bm, BMFace *f, BMVert *v1, BMVert *v2, } #endif - BM_CHECK_ELEMENT(bm, e); - BM_CHECK_ELEMENT(bm, f); - BM_CHECK_ELEMENT(bm, f2); + BM_CHECK_ELEMENT(e); + BM_CHECK_ELEMENT(f); + BM_CHECK_ELEMENT(f2); return f2; } @@ -1391,10 +1391,10 @@ BMVert *bmesh_semv(BMesh *bm, BMVert *tv, BMEdge *e, BMEdge **r_e) BMESH_ASSERT(l->e != l->next->e); /* verify loop cycle for kloop-> */ - BM_CHECK_ELEMENT(bm, l); - BM_CHECK_ELEMENT(bm, l->v); - BM_CHECK_ELEMENT(bm, l->e); - BM_CHECK_ELEMENT(bm, l->f); + BM_CHECK_ELEMENT(l); + BM_CHECK_ELEMENT(l->v); + BM_CHECK_ELEMENT(l->e); + BM_CHECK_ELEMENT(l->f); } /* verify loop->v and loop->next->v pointers for ne */ for (i = 0, l = ne->l; i < radlen; i++, l = l->radial_next) { @@ -1406,18 +1406,18 @@ BMVert *bmesh_semv(BMesh *bm, BMVert *tv, BMEdge *e, BMEdge **r_e) BMESH_ASSERT(l->v != l->next->v); BMESH_ASSERT(l->e != l->next->e); - BM_CHECK_ELEMENT(bm, l); - BM_CHECK_ELEMENT(bm, l->v); - BM_CHECK_ELEMENT(bm, l->e); - BM_CHECK_ELEMENT(bm, l->f); + BM_CHECK_ELEMENT(l); + BM_CHECK_ELEMENT(l->v); + BM_CHECK_ELEMENT(l->e); + BM_CHECK_ELEMENT(l->f); } } - BM_CHECK_ELEMENT(bm, ne); - BM_CHECK_ELEMENT(bm, nv); - BM_CHECK_ELEMENT(bm, ov); - BM_CHECK_ELEMENT(bm, e); - BM_CHECK_ELEMENT(bm, tv); + BM_CHECK_ELEMENT(ne); + BM_CHECK_ELEMENT(nv); + BM_CHECK_ELEMENT(ov); + BM_CHECK_ELEMENT(e); + BM_CHECK_ELEMENT(tv); if (r_e) *r_e = ne; return nv; @@ -1561,10 +1561,10 @@ BMEdge *bmesh_jekv(BMesh *bm, BMEdge *ke, BMVert *kv, const short check_edge_dou edok = bmesh_loop_validate(l->f); BMESH_ASSERT(edok != FALSE); - BM_CHECK_ELEMENT(bm, l); - BM_CHECK_ELEMENT(bm, l->v); - BM_CHECK_ELEMENT(bm, l->e); - BM_CHECK_ELEMENT(bm, l->f); + BM_CHECK_ELEMENT(l); + BM_CHECK_ELEMENT(l->v); + BM_CHECK_ELEMENT(l->e); + BM_CHECK_ELEMENT(l->f); } if (check_edge_double) { @@ -1574,9 +1574,9 @@ BMEdge *bmesh_jekv(BMesh *bm, BMEdge *ke, BMVert *kv, const short check_edge_dou } } - BM_CHECK_ELEMENT(bm, ov); - BM_CHECK_ELEMENT(bm, tv); - BM_CHECK_ELEMENT(bm, oe); + BM_CHECK_ELEMENT(ov); + BM_CHECK_ELEMENT(tv); + BM_CHECK_ELEMENT(oe); return oe; } @@ -1718,7 +1718,7 @@ BMFace *bmesh_jfke(BMesh *bm, BMFace *f1, BMFace *f2, BMEdge *e) /* account for both above */ bm->elem_index_dirty |= BM_EDGE | BM_FACE; - BM_CHECK_ELEMENT(bm, f1); + BM_CHECK_ELEMENT(f1); /* validate the new loop cycle */ edok = bmesh_loop_validate(f1); @@ -1757,8 +1757,8 @@ int BM_vert_splice(BMesh *bm, BMVert *v, BMVert *vtarget) bmesh_disk_edge_append(e, vtarget); } - BM_CHECK_ELEMENT(bm, v); - BM_CHECK_ELEMENT(bm, vtarget); + BM_CHECK_ELEMENT(v); + BM_CHECK_ELEMENT(vtarget); /* v is unused now, and can be killed */ BM_vert_kill(bm, v); @@ -1880,7 +1880,7 @@ int bmesh_vert_separate(BMesh *bm, BMVert *v, BMVert ***r_vout, int *r_vout_len) BLI_ghash_free(visithash, NULL, NULL); for (i = 0; i < maxindex; i++) { - BM_CHECK_ELEMENT(bm, verts[i]); + BM_CHECK_ELEMENT(verts[i]); } if (r_vout_len != NULL) { @@ -1943,8 +1943,8 @@ int BM_edge_splice(BMesh *bm, BMEdge *e, BMEdge *etarget) BLI_assert(bmesh_radial_length(e->l) == 0); - BM_CHECK_ELEMENT(bm, e); - BM_CHECK_ELEMENT(bm, etarget); + BM_CHECK_ELEMENT(e); + BM_CHECK_ELEMENT(etarget); /* removes from disks too */ BM_edge_kill(bm, e); @@ -1989,8 +1989,8 @@ int bmesh_edge_separate(BMesh *bm, BMEdge *e, BMLoop *l_sep) BLI_assert(bmesh_radial_length(e->l) == radlen - 1); BLI_assert(bmesh_radial_length(ne->l) == 1); - BM_CHECK_ELEMENT(bm, ne); - BM_CHECK_ELEMENT(bm, e); + BM_CHECK_ELEMENT(ne); + BM_CHECK_ELEMENT(e); return TRUE; } diff --git a/source/blender/bmesh/intern/bmesh_interp.c b/source/blender/bmesh/intern/bmesh_interp.c index c56d2c622a4..5149a5436a2 100644 --- a/source/blender/bmesh/intern/bmesh_interp.c +++ b/source/blender/bmesh/intern/bmesh_interp.c @@ -327,16 +327,16 @@ static void mdisp_axis_from_quad(float v1[3], float v2[3], float UNUSED(v3[3]), /* tl is loop to project onto, l is loop whose internal displacement, co, is being * projected. x and y are location in loop's mdisps grid of point co. */ -static int mdisp_in_mdispquad(BMesh *bm, BMLoop *l, BMLoop *tl, float p[3], float *x, float *y, +static int mdisp_in_mdispquad(BMLoop *l, BMLoop *tl, float p[3], float *x, float *y, int res, float axis_x[3], float axis_y[3]) { float v1[3], v2[3], c[3], v3[3], v4[3], e1[3], e2[3]; float eps = FLT_EPSILON * 4000; if (len_v3(l->v->no) == 0.0f) - BM_vert_normal_update_all(bm, l->v); + BM_vert_normal_update_all(l->v); if (len_v3(tl->v->no) == 0.0f) - BM_vert_normal_update_all(bm, tl->v); + BM_vert_normal_update_all(tl->v); compute_mdisp_quad(tl, v1, v2, v3, v4, e1, e2); @@ -466,7 +466,7 @@ static void bm_loop_interp_mdisps(BMesh *bm, BMLoop *target, BMFace *source) md1 = CustomData_bmesh_get(&bm->ldata, target->head.data, CD_MDISPS); md2 = CustomData_bmesh_get(&bm->ldata, l_iter->head.data, CD_MDISPS); - if (mdisp_in_mdispquad(bm, target, l_iter, co, &x2, &y2, res, src_axis_x, src_axis_y)) { + if (mdisp_in_mdispquad(target, l_iter, co, &x2, &y2, res, src_axis_x, src_axis_y)) { old_mdisps_bilinear(md1->disps[iy * res + ix], md2->disps, res, (float)x2, (float)y2); bm_loop_flip_disp(src_axis_x, src_axis_y, axis_x, axis_y, md1->disps[iy * res + ix]); diff --git a/source/blender/bmesh/intern/bmesh_marking.c b/source/blender/bmesh/intern/bmesh_marking.c index 2e61592c172..7cf29031765 100644 --- a/source/blender/bmesh/intern/bmesh_marking.c +++ b/source/blender/bmesh/intern/bmesh_marking.c @@ -563,7 +563,7 @@ BMFace *BM_active_face_get(BMesh *bm, int sloppy) * - #EM_editselection_normal * - #EM_editselection_plane */ -void BM_editselection_center(BMesh *bm, float r_center[3], BMEditSelection *ese) +void BM_editselection_center(float r_center[3], BMEditSelection *ese) { if (ese->htype == BM_VERT) { BMVert *eve = (BMVert *)ese->ele; @@ -576,7 +576,7 @@ void BM_editselection_center(BMesh *bm, float r_center[3], BMEditSelection *ese) } else if (ese->htype == BM_FACE) { BMFace *efa = (BMFace *)ese->ele; - BM_face_center_bounds_calc(bm, efa, r_center); + BM_face_center_bounds_calc(efa, r_center); } } @@ -621,7 +621,7 @@ void BM_editselection_plane(BMesh *bm, float r_plane[3], BMEditSelection *ese) float vec[3] = {0.0f, 0.0f, 0.0f}; if (ese->prev) { /* use previously selected data to make a useful vertex plane */ - BM_editselection_center(bm, vec, ese->prev); + BM_editselection_center(vec, ese->prev); sub_v3_v3v3(r_plane, vec, eve->co); } else { @@ -890,7 +890,7 @@ void BM_mesh_elem_hflag_enable_all(BMesh *bm, const char htype, const char hflag /***************** Mesh Hiding stuff *********** */ -static void vert_flush_hide_set(BMesh *bm, BMVert *v) +static void vert_flush_hide_set(BMVert *v) { BMIter iter; BMEdge *e; @@ -903,7 +903,7 @@ static void vert_flush_hide_set(BMesh *bm, BMVert *v) BM_elem_flag_set(v, BM_ELEM_HIDDEN, hide); } -static void edge_flush_hide(BMesh *bm, BMEdge *e) +static void edge_flush_hide(BMEdge *e) { BMIter iter; BMFace *f; @@ -916,7 +916,7 @@ static void edge_flush_hide(BMesh *bm, BMEdge *e) BM_elem_flag_set(e, BM_ELEM_HIDDEN, hide); } -void BM_vert_hide_set(BMesh *bm, BMVert *v, int hide) +void BM_vert_hide_set(BMVert *v, int hide) { /* vert hiding: vert + surrounding edges and faces */ BMIter iter, fiter; @@ -934,7 +934,7 @@ void BM_vert_hide_set(BMesh *bm, BMVert *v, int hide) } } -void BM_edge_hide_set(BMesh *bm, BMEdge *e, int hide) +void BM_edge_hide_set(BMEdge *e, int hide) { BMIter iter; BMFace *f; @@ -948,11 +948,11 @@ void BM_edge_hide_set(BMesh *bm, BMEdge *e, int hide) BM_elem_flag_set(e, BM_ELEM_HIDDEN, hide); /* hide vertices if necessary */ - vert_flush_hide_set(bm, e->v1); - vert_flush_hide_set(bm, e->v2); + vert_flush_hide_set(e->v1); + vert_flush_hide_set(e->v2); } -void BM_face_hide_set(BMesh *bm, BMFace *f, int hide) +void BM_face_hide_set(BMFace *f, int hide) { BMIter iter; BMLoop *l; @@ -960,11 +960,11 @@ void BM_face_hide_set(BMesh *bm, BMFace *f, int hide) BM_elem_flag_set(f, BM_ELEM_HIDDEN, hide); BM_ITER_ELEM (l, &iter, f, BM_LOOPS_OF_FACE) { - edge_flush_hide(bm, l->e); + edge_flush_hide(l->e); } BM_ITER_ELEM (l, &iter, f, BM_LOOPS_OF_FACE) { - vert_flush_hide_set(bm, l->v); + vert_flush_hide_set(l->v); } } @@ -975,15 +975,15 @@ void _bm_elem_hide_set(BMesh *bm, BMHeader *head, int hide) switch (head->htype) { case BM_VERT: if (hide) BM_vert_select_set(bm, (BMVert *)head, FALSE); - BM_vert_hide_set(bm, (BMVert *)head, hide); + BM_vert_hide_set((BMVert *)head, hide); break; case BM_EDGE: if (hide) BM_edge_select_set(bm, (BMEdge *)head, FALSE); - BM_edge_hide_set(bm, (BMEdge *)head, hide); + BM_edge_hide_set((BMEdge *)head, hide); break; case BM_FACE: if (hide) BM_face_select_set(bm, (BMFace *)head, FALSE); - BM_face_hide_set(bm, (BMFace *)head, hide); + BM_face_hide_set((BMFace *)head, hide); break; default: BMESH_ASSERT(0); diff --git a/source/blender/bmesh/intern/bmesh_marking.h b/source/blender/bmesh/intern/bmesh_marking.h index 73423bc181d..a3e97ea9677 100644 --- a/source/blender/bmesh/intern/bmesh_marking.h +++ b/source/blender/bmesh/intern/bmesh_marking.h @@ -37,9 +37,9 @@ typedef struct BMEditSelection /* geometry hiding code */ #define BM_elem_hide_set(bm, ele, hide) _bm_elem_hide_set(bm, &(ele)->head, hide) void _bm_elem_hide_set(BMesh *bm, BMHeader *ele, int hide); -void BM_vert_hide_set(BMesh *bm, BMVert *v, int hide); -void BM_edge_hide_set(BMesh *bm, BMEdge *e, int hide); -void BM_face_hide_set(BMesh *bm, BMFace *f, int hide); +void BM_vert_hide_set(BMVert *v, int hide); +void BM_edge_hide_set(BMEdge *e, int hide); +void BM_face_hide_set(BMFace *f, int hide); /* Selection code */ #define BM_elem_select_set(bm, ele, hide) _bm_elem_select_set(bm, &(ele)->head, hide) @@ -71,9 +71,9 @@ int BM_mesh_elem_hflag_count_enabled(BMesh *bm, const char htype, const char hfl int BM_mesh_elem_hflag_count_disabled(BMesh *bm, const char htype, const char hflag, int respecthide); /* edit selection stuff */ -void BM_active_face_set(BMesh *em, BMFace *f); +void BM_active_face_set(BMesh *bm, BMFace *f); BMFace *BM_active_face_get(BMesh *bm, int sloppy); -void BM_editselection_center(BMesh *bm, float r_center[3], BMEditSelection *ese); +void BM_editselection_center(float r_center[3], BMEditSelection *ese); void BM_editselection_normal(float r_normal[3], BMEditSelection *ese); void BM_editselection_plane(BMesh *bm, float r_plane[3], BMEditSelection *ese); diff --git a/source/blender/bmesh/intern/bmesh_mesh.c b/source/blender/bmesh/intern/bmesh_mesh.c index e2b9732e87a..454ab58d720 100644 --- a/source/blender/bmesh/intern/bmesh_mesh.c +++ b/source/blender/bmesh/intern/bmesh_mesh.c @@ -219,7 +219,7 @@ void BM_mesh_normals_update(BMesh *bm, const short skip_hidden) continue; #endif - BM_face_normal_update(bm, f); + BM_face_normal_update(f); } /* Zero out vertex normals */ diff --git a/source/blender/bmesh/intern/bmesh_mesh_conv.c b/source/blender/bmesh/intern/bmesh_mesh_conv.c index d15e3d36523..574fb62b703 100644 --- a/source/blender/bmesh/intern/bmesh_mesh_conv.c +++ b/source/blender/bmesh/intern/bmesh_mesh_conv.c @@ -582,7 +582,7 @@ void BM_mesh_bm_to_me(BMesh *bm, Mesh *me, int dotess) i++; mvert++; - BM_CHECK_ELEMENT(bm, v); + BM_CHECK_ELEMENT(v); } bm->elem_index_dirty &= ~BM_VERT; @@ -608,7 +608,7 @@ void BM_mesh_bm_to_me(BMesh *bm, Mesh *me, int dotess) i++; med++; - BM_CHECK_ELEMENT(bm, e); + BM_CHECK_ELEMENT(e); } bm->elem_index_dirty &= ~BM_EDGE; @@ -627,9 +627,9 @@ void BM_mesh_bm_to_me(BMesh *bm, Mesh *me, int dotess) /* copy over customdat */ CustomData_from_bmesh_block(&bm->ldata, &me->ldata, l->head.data, j); - BM_CHECK_ELEMENT(bm, l); - BM_CHECK_ELEMENT(bm, l->e); - BM_CHECK_ELEMENT(bm, l->v); + BM_CHECK_ELEMENT(l); + BM_CHECK_ELEMENT(l->e); + BM_CHECK_ELEMENT(l->v); } if (f == bm->act_face) me->act_face = i; @@ -639,7 +639,7 @@ void BM_mesh_bm_to_me(BMesh *bm, Mesh *me, int dotess) i++; mpoly++; - BM_CHECK_ELEMENT(bm, f); + BM_CHECK_ELEMENT(f); } /* patch hook indices and vertex parents */ diff --git a/source/blender/bmesh/intern/bmesh_mods.c b/source/blender/bmesh/intern/bmesh_mods.c index a29b657d76e..21654097219 100644 --- a/source/blender/bmesh/intern/bmesh_mods.c +++ b/source/blender/bmesh/intern/bmesh_mods.c @@ -817,14 +817,14 @@ int BM_face_validate(BMesh *bm, BMFace *face, FILE *err) * * \note #BM_edge_rotate_check must have already run. */ -void BM_edge_rotate_calc(BMesh *bm, BMEdge *e, int ccw, +void BM_edge_rotate_calc(BMEdge *e, int ccw, BMLoop **r_l1, BMLoop **r_l2) { BMVert *v1, *v2; BMFace *fa, *fb; /* this should have already run */ - BLI_assert(BM_edge_rotate_check(bm, e) == TRUE); + BLI_assert(BM_edge_rotate_check(e) == TRUE); /* we know this will work */ BM_edge_face_pair(e, &fa, &fb); @@ -842,9 +842,6 @@ void BM_edge_rotate_calc(BMesh *bm, BMEdge *e, int ccw, *r_l1 = BM_face_other_vert_loop(fb, v2, v1); *r_l2 = BM_face_other_vert_loop(fa, v1, v2); - - /* when assert isn't used */ - (void)bm; } /** @@ -853,7 +850,7 @@ void BM_edge_rotate_calc(BMesh *bm, BMEdge *e, int ccw, * Quick check to see if we could rotate the edge, * use this to avoid calling exceptions on common cases. */ -int BM_edge_rotate_check(BMesh *UNUSED(bm), BMEdge *e) +int BM_edge_rotate_check(BMEdge *e) { BMFace *fa, *fb; if (BM_edge_face_pair(e, &fa, &fb)) { @@ -894,8 +891,7 @@ int BM_edge_rotate_check(BMesh *UNUSED(bm), BMEdge *e) * \param l1,l2 are the loops of the proposed verts to rotate too and should * be the result of calling #BM_edge_rotate_calc */ -int BM_edge_rotate_check_degenerate(BMesh *bm, BMEdge *e, - BMLoop *l1, BMLoop *l2) +int BM_edge_rotate_check_degenerate(BMEdge *e, BMLoop *l1, BMLoop *l2) { /* note: for these vars 'old' just means initial edge state. */ @@ -922,7 +918,7 @@ int BM_edge_rotate_check_degenerate(BMesh *bm, BMEdge *e, BMVert *v1_alt, *v2_alt; /* this should have already run */ - BLI_assert(BM_edge_rotate_check(bm, e) == TRUE); + BLI_assert(BM_edge_rotate_check(e) == TRUE); BM_edge_ordered_verts(e, &v1_old, &v2_old); @@ -981,12 +977,9 @@ int BM_edge_rotate_check_degenerate(BMesh *bm, BMEdge *e, } return TRUE; - - /* when assert isn't used */ - (void)bm; } -int BM_edge_rotate_check_beauty(BMesh *UNUSED(bm), BMEdge *e, +int BM_edge_rotate_check_beauty(BMEdge *e, BMLoop *l1, BMLoop *l2) { /* Stupid check for now: @@ -1019,11 +1012,11 @@ BMEdge *BM_edge_rotate(BMesh *bm, BMEdge *e, const short ccw, const short check_ char f_hflag_prev_1; char f_hflag_prev_2; - if (!BM_edge_rotate_check(bm, e)) { + if (!BM_edge_rotate_check(e)) { return NULL; } - BM_edge_rotate_calc(bm, e, ccw, &l1, &l2); + BM_edge_rotate_calc(e, ccw, &l1, &l2); /* the loops will be freed so assign verts */ v1 = l1->v; @@ -1033,7 +1026,7 @@ BMEdge *BM_edge_rotate(BMesh *bm, BMEdge *e, const short ccw, const short check_ /* Checking Code - make sure we can rotate */ if (check_flag & BM_EDGEROT_CHECK_BEAUTY) { - if (!BM_edge_rotate_check_beauty(bm, e, l1, l2)) { + if (!BM_edge_rotate_check_beauty(e, l1, l2)) { return NULL; } } @@ -1047,7 +1040,7 @@ BMEdge *BM_edge_rotate(BMesh *bm, BMEdge *e, const short ccw, const short check_ /* slowest, check last */ if (check_flag & BM_EDGEROT_CHECK_DEGENERATE) { - if (!BM_edge_rotate_check_degenerate(bm, e, l1, l2)) { + if (!BM_edge_rotate_check_degenerate(e, l1, l2)) { return NULL; } } diff --git a/source/blender/bmesh/intern/bmesh_mods.h b/source/blender/bmesh/intern/bmesh_mods.h index ba601eb64dc..ba6acac1a27 100644 --- a/source/blender/bmesh/intern/bmesh_mods.h +++ b/source/blender/bmesh/intern/bmesh_mods.h @@ -43,9 +43,9 @@ BMFace *BM_face_split(BMesh *bm, BMFace *f, BMEdge *example, const short nodouble); BMFace *BM_face_split_n(BMesh *bm, BMFace *f, - BMVert *v1, BMVert *v2, - float cos[][3], int n, - BMLoop **r_l, BMEdge *example); + BMVert *v1, BMVert *v2, + float cos[][3], int n, + BMLoop **r_l, BMEdge *example); BMEdge* BM_vert_collapse_faces(BMesh *bm, BMEdge *ke, BMVert *kv, float fac, const short join_faces, const short kill_degenerate_faces); @@ -59,12 +59,12 @@ BMVert *BM_edge_split_n(BMesh *bm, BMEdge *e, int numcuts); int BM_face_validate(BMesh *bm, BMFace *face, FILE *err); -void BM_edge_rotate_calc(BMesh *bm, BMEdge *e, int ccw, - BMLoop **r_l1, BMLoop **r_l2); -int BM_edge_rotate_check(BMesh *UNUSED(bm), BMEdge *e); -int BM_edge_rotate_check_degenerate(BMesh *bm, BMEdge *e, +void BM_edge_rotate_calc(BMEdge *e, int ccw, + BMLoop **r_l1, BMLoop **r_l2); +int BM_edge_rotate_check(BMEdge *e); +int BM_edge_rotate_check_degenerate(BMEdge *e, BMLoop *l1, BMLoop *l2); -int BM_edge_rotate_check_beauty(BMesh *bm, BMEdge *e, +int BM_edge_rotate_check_beauty(BMEdge *e, BMLoop *l1, BMLoop *l2); BMEdge *BM_edge_rotate(BMesh *bm, BMEdge *e, const short ccw, const short check_flag); diff --git a/source/blender/bmesh/intern/bmesh_operators_private.h b/source/blender/bmesh/intern/bmesh_operators_private.h index 62cabe88b05..423b30a503a 100644 --- a/source/blender/bmesh/intern/bmesh_operators_private.h +++ b/source/blender/bmesh/intern/bmesh_operators_private.h @@ -37,11 +37,11 @@ void bmo_split_exec(BMesh *bm, BMOperator *op); void bmo_spin_exec(BMesh *bm, BMOperator *op); void bmo_dupe_exec(BMesh *bm, BMOperator *op); void bmo_del_exec(BMesh *bm, BMOperator *op); -void bmo_esubd_exec(BMesh *bmesh, BMOperator *op); -void bmo_triangulate_exec(BMesh *bmesh, BMOperator *op); -void bmo_dissolve_faces_exec(BMesh *bmesh, BMOperator *op); -void bmo_dissolve_verts_exec(BMesh *bmesh, BMOperator *op); -void bmo_dissolve_limit_exec(BMesh *bmesh, BMOperator *op); +void bmo_esubd_exec(BMesh *bm, BMOperator *op); +void bmo_triangulate_exec(BMesh *bm, BMOperator *op); +void bmo_dissolve_faces_exec(BMesh *bm, BMOperator *op); +void bmo_dissolve_verts_exec(BMesh *bm, BMOperator *op); +void bmo_dissolve_limit_exec(BMesh *bm, BMOperator *op); void bmo_extrude_face_region_exec(BMesh *bm, BMOperator *op); void bmo_vertex_slide_exec(BMesh *bm, BMOperator *op); void bmo_connectverts_exec(BMesh *bm, BMOperator *op); diff --git a/source/blender/bmesh/intern/bmesh_polygon.c b/source/blender/bmesh/intern/bmesh_polygon.c index 971ad96c24a..e7ee5cb605d 100644 --- a/source/blender/bmesh/intern/bmesh_polygon.c +++ b/source/blender/bmesh/intern/bmesh_polygon.c @@ -153,7 +153,7 @@ static void bm_face_compute_poly_normal_vertex_cos(BMFace *f, float n[3], /** * get the area of the face */ -float BM_face_area_calc(BMesh *bm, BMFace *f) +float BM_face_area_calc(BMFace *f) { BMLoop *l; BMIter iter; @@ -187,7 +187,7 @@ float BM_face_area_calc(BMesh *bm, BMFace *f) /** * compute the perimeter of an ngon */ -float BM_face_perimeter_calc(BMesh *UNUSED(bm), BMFace *f) +float BM_face_perimeter_calc(BMFace *f) { BMLoop *l_iter, *l_first; float perimeter = 0.0f; @@ -203,7 +203,7 @@ float BM_face_perimeter_calc(BMesh *UNUSED(bm), BMFace *f) /** * computes center of face in 3d. uses center of bounding box. */ -void BM_face_center_bounds_calc(BMesh *UNUSED(bm), BMFace *f, float r_cent[3]) +void BM_face_center_bounds_calc(BMFace *f, float r_cent[3]) { BMLoop *l_iter; BMLoop *l_first; @@ -222,7 +222,7 @@ void BM_face_center_bounds_calc(BMesh *UNUSED(bm), BMFace *f, float r_cent[3]) /** * computes the center of a face, using the mean average */ -void BM_face_center_mean_calc(BMesh *UNUSED(bm), BMFace *f, float r_cent[3]) +void BM_face_center_mean_calc(BMFace *f, float r_cent[3]) { BMLoop *l_iter; BMLoop *l_first; @@ -332,24 +332,23 @@ void poly_rotate_plane(const float normal[3], float (*verts)[3], const int nvert /** * updates face and vertex normals incident on an edge */ -void BM_edge_normals_update(BMesh *bm, BMEdge *e) +void BM_edge_normals_update(BMEdge *e) { BMIter iter; BMFace *f; - f = BM_iter_new(&iter, bm, BM_FACES_OF_EDGE, e); - for (; f; f = BM_iter_step(&iter)) { - BM_face_normal_update(bm, f); + BM_ITER_ELEM (f, &iter, e, BM_FACES_OF_EDGE) { + BM_face_normal_update(f); } - BM_vert_normal_update(bm, e->v1); - BM_vert_normal_update(bm, e->v2); + BM_vert_normal_update(e->v1); + BM_vert_normal_update(e->v2); } /** * update a vert normal (but not the faces incident on it) */ -void BM_vert_normal_update(BMesh *bm, BMVert *v) +void BM_vert_normal_update(BMVert *v) { /* TODO, we can normalize each edge only once, then compare with previous edge */ @@ -379,16 +378,16 @@ void BM_vert_normal_update(BMesh *bm, BMVert *v) } } -void BM_vert_normal_update_all(BMesh *bm, BMVert *v) +void BM_vert_normal_update_all(BMVert *v) { BMIter iter; BMFace *f; BM_ITER_ELEM (f, &iter, v, BM_FACES_OF_VERT) { - BM_face_normal_update(bm, f); + BM_face_normal_update(f); } - BM_vert_normal_update(bm, v); + BM_vert_normal_update(v); } /** @@ -401,7 +400,7 @@ void BM_vert_normal_update_all(BMesh *bm, BMVert *v) * is passed in as well. */ -void BM_face_normal_update(BMesh *UNUSED(bm), BMFace *f) +void BM_face_normal_update(BMFace *f) { BMLoop *l; @@ -564,7 +563,7 @@ static int linecrossesf(const float v1[2], const float v2[2], const float v3[2], * instead of projecting co directly into f's orientation space, * so there might be accuracy issues. */ -int BM_face_point_inside_test(BMesh *bm, BMFace *f, const float co[3]) +int BM_face_point_inside_test(BMFace *f, const float co[3]) { int ax, ay; float co2[2], cent[2] = {0.0f, 0.0f}, out[2] = {FLT_MAX * 0.5f, FLT_MAX * 0.5f}; @@ -574,7 +573,7 @@ int BM_face_point_inside_test(BMesh *bm, BMFace *f, const float co[3]) float onepluseps = 1.0f + (float)FLT_EPSILON * 150.0f; if (dot_v3v3(f->no, f->no) <= FLT_EPSILON * 10) - BM_face_normal_update(bm, f); + BM_face_normal_update(f); /* find best projection of face XY, XZ or YZ: barycentric weights of * the 2d projected coords are the same and faster to compute @@ -659,7 +658,7 @@ static int goodline(float const (*projectverts)[3], BMFace *f, * * \param use_beauty Currently only applies to quads, can be extended later on. */ -static BMLoop *find_ear(BMesh *UNUSED(bm), BMFace *f, float (*verts)[3], const int nvert, const int use_beauty) +static BMLoop *find_ear(BMFace *f, float (*verts)[3], const int nvert, const int use_beauty) { BMLoop *bestear = NULL; @@ -779,7 +778,7 @@ void BM_face_triangulate(BMesh *bm, BMFace *f, float (*projectverts)[3], done = 0; while (!done && f->len > 3) { done = 1; - l_iter = find_ear(bm, f, projectverts, nvert, use_beauty); + l_iter = find_ear(f, projectverts, nvert, use_beauty); if (l_iter) { done = 0; /* v = l->v; */ /* UNUSED */ diff --git a/source/blender/bmesh/intern/bmesh_polygon.h b/source/blender/bmesh/intern/bmesh_polygon.h index 71387f18ce2..117a47d34f2 100644 --- a/source/blender/bmesh/intern/bmesh_polygon.h +++ b/source/blender/bmesh/intern/bmesh_polygon.h @@ -27,22 +27,22 @@ * \ingroup bmesh */ -float BM_face_area_calc(BMesh *bm, BMFace *f); -float BM_face_perimeter_calc(BMesh *bm, BMFace *f); -void BM_face_center_bounds_calc(BMesh *bm, BMFace *f, float center[3]); -void BM_face_center_mean_calc(BMesh *bm, BMFace *f, float center[3]); +float BM_face_area_calc(BMFace *f); +float BM_face_perimeter_calc(BMFace *f); +void BM_face_center_bounds_calc(BMFace *f, float center[3]); +void BM_face_center_mean_calc(BMFace *f, float center[3]); -void BM_face_normal_update(BMesh *bm, BMFace *f); +void BM_face_normal_update(BMFace *f); void BM_face_normal_update_vcos(BMesh *bm, BMFace *f, float no[3], float const (*vertexCos)[3]); -void BM_edge_normals_update(BMesh *bm, BMEdge *e); +void BM_edge_normals_update(BMEdge *e); -void BM_vert_normal_update(BMesh *bm, BMVert *v); -void BM_vert_normal_update_all(BMesh *bm, BMVert *v); +void BM_vert_normal_update(BMVert *v); +void BM_vert_normal_update_all(BMVert *v); void BM_face_normal_flip(BMesh *bm, BMFace *f); -int BM_face_point_inside_test(BMesh *bm, BMFace *f, const float co[3]); +int BM_face_point_inside_test(BMFace *f, const float co[3]); void BM_face_triangulate(BMesh *bm, BMFace *f, float (*projectverts)[3], const short newedge_oflag, const short newface_oflag, BMFace **newfaces, diff --git a/source/blender/bmesh/intern/bmesh_private.h b/source/blender/bmesh/intern/bmesh_private.h index 791c8d68880..f963425e1bd 100644 --- a/source/blender/bmesh/intern/bmesh_private.h +++ b/source/blender/bmesh/intern/bmesh_private.h @@ -37,13 +37,13 @@ */ /* returns positive nonzero on error */ -int bmesh_elem_check(BMesh *bm, void *element, const char htype); +int bmesh_elem_check(void *element, const char htype); -#define BM_CHECK_ELEMENT(bm, el) \ - if (bmesh_elem_check(bm, el, ((BMHeader *)el)->htype)) { \ +#define BM_CHECK_ELEMENT(el) \ + if (bmesh_elem_check(el, ((BMHeader *)el)->htype)) { \ printf("check_element failure, with code %i on line %i in file\n" \ " \"%s\"\n\n", \ - bmesh_elem_check(bm, el, ((BMHeader *)el)->htype), \ + bmesh_elem_check(el, ((BMHeader *)el)->htype), \ __LINE__, __FILE__); \ } diff --git a/source/blender/bmesh/intern/bmesh_queries.c b/source/blender/bmesh/intern/bmesh_queries.c index 1238038c67c..af614f78aff 100644 --- a/source/blender/bmesh/intern/bmesh_queries.c +++ b/source/blender/bmesh/intern/bmesh_queries.c @@ -962,7 +962,7 @@ int BM_face_exists(BMesh *bm, BMVert **varr, int len, BMFace **r_existface) * * \a earr and \a varr can be in any order, however they _must_ form a closed loop. */ -int BM_face_exists_multi(BMesh *bm, BMVert **varr, BMEdge **earr, int len) +int BM_face_exists_multi(BMVert **varr, BMEdge **earr, int len) { BMFace *f; BMEdge *e; @@ -1068,7 +1068,7 @@ int BM_face_exists_multi(BMesh *bm, BMVert **varr, BMEdge **earr, int len) } /* same as 'BM_face_exists_multi' but built vert array from edges */ -int BM_face_exists_multi_edge(BMesh *bm, BMEdge **earr, int len) +int BM_face_exists_multi_edge(BMEdge **earr, int len) { BMVert **varr; BLI_array_fixedstack_declare(varr, BM_NGON_STACK_SIZE, len, __func__); @@ -1091,7 +1091,7 @@ int BM_face_exists_multi_edge(BMesh *bm, BMEdge **earr, int len) return FALSE; } - ok = BM_face_exists_multi(bm, varr, earr, len); + ok = BM_face_exists_multi(varr, earr, len); BLI_array_fixedstack_free(varr); diff --git a/source/blender/bmesh/intern/bmesh_queries.h b/source/blender/bmesh/intern/bmesh_queries.h index 280fe843b1c..73d724c7bdd 100644 --- a/source/blender/bmesh/intern/bmesh_queries.h +++ b/source/blender/bmesh/intern/bmesh_queries.h @@ -72,8 +72,8 @@ int BM_face_exists_overlap(BMesh *bm, BMVert **varr, int len, BMFace **r_exi int BM_face_exists(BMesh *bm, BMVert **varr, int len, BMFace **r_existface); -int BM_face_exists_multi(BMesh *bm, BMVert **varr, BMEdge **earr, int len); -int BM_face_exists_multi_edge(BMesh *bm, BMEdge **earr, int len); +int BM_face_exists_multi(BMVert **varr, BMEdge **earr, int len); +int BM_face_exists_multi_edge(BMEdge **earr, int len); int BM_face_share_edge_count(BMFace *f1, BMFace *f2); int BM_edge_share_face_count(BMEdge *e1, BMEdge *e2); |