[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [45785] trunk/blender/source/blender: code cleanup: remove unused BMesh args.
Campbell Barton
ideasman42 at gmail.com
Thu Apr 19 16:38:09 CEST 2012
Revision: 45785
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=45785
Author: campbellbarton
Date: 2012-04-19 14:38:09 +0000 (Thu, 19 Apr 2012)
Log Message:
-----------
code cleanup: remove unused BMesh args.
Modified Paths:
--------------
trunk/blender/source/blender/bmesh/intern/bmesh_core.c
trunk/blender/source/blender/bmesh/intern/bmesh_interp.c
trunk/blender/source/blender/bmesh/intern/bmesh_marking.c
trunk/blender/source/blender/bmesh/intern/bmesh_marking.h
trunk/blender/source/blender/bmesh/intern/bmesh_mesh.c
trunk/blender/source/blender/bmesh/intern/bmesh_mesh_conv.c
trunk/blender/source/blender/bmesh/intern/bmesh_mods.c
trunk/blender/source/blender/bmesh/intern/bmesh_mods.h
trunk/blender/source/blender/bmesh/intern/bmesh_operators_private.h
trunk/blender/source/blender/bmesh/intern/bmesh_polygon.c
trunk/blender/source/blender/bmesh/intern/bmesh_polygon.h
trunk/blender/source/blender/bmesh/intern/bmesh_private.h
trunk/blender/source/blender/bmesh/intern/bmesh_queries.c
trunk/blender/source/blender/bmesh/intern/bmesh_queries.h
trunk/blender/source/blender/bmesh/operators/bmo_bevel.c
trunk/blender/source/blender/bmesh/operators/bmo_create.c
trunk/blender/source/blender/bmesh/operators/bmo_dissolve.c
trunk/blender/source/blender/bmesh/operators/bmo_extrude.c
trunk/blender/source/blender/bmesh/operators/bmo_join_triangles.c
trunk/blender/source/blender/bmesh/operators/bmo_subdivide.c
trunk/blender/source/blender/bmesh/operators/bmo_utils.c
trunk/blender/source/blender/bmesh/tools/BME_bevel.c
trunk/blender/source/blender/editors/include/ED_mesh.h
trunk/blender/source/blender/editors/mesh/editmesh_knife.c
trunk/blender/source/blender/editors/mesh/editmesh_loopcut.c
trunk/blender/source/blender/editors/mesh/editmesh_rip.c
trunk/blender/source/blender/editors/mesh/editmesh_select.c
trunk/blender/source/blender/editors/mesh/editmesh_slide.c
trunk/blender/source/blender/editors/mesh/editmesh_utils.c
trunk/blender/source/blender/editors/space_view3d/drawobject.c
trunk/blender/source/blender/editors/space_view3d/view3d_snap.c
trunk/blender/source/blender/editors/transform/transform.c
trunk/blender/source/blender/editors/transform/transform_conversions.c
trunk/blender/source/blender/editors/transform/transform_generics.c
trunk/blender/source/blender/editors/transform/transform_manipulator.c
trunk/blender/source/blender/editors/uvedit/uvedit_draw.c
trunk/blender/source/blender/editors/uvedit/uvedit_ops.c
trunk/blender/source/blender/python/bmesh/bmesh_py_types.c
Modified: trunk/blender/source/blender/bmesh/intern/bmesh_core.c
===================================================================
--- trunk/blender/source/blender/bmesh/intern/bmesh_core.c 2012-04-19 13:59:03 UTC (rev 45784)
+++ trunk/blender/source/blender/bmesh/intern/bmesh_core.c 2012-04-19 14:38:09 UTC (rev 45785)
@@ -80,7 +80,7 @@
BM_elem_attrs_copy(bm, bm, example, v);
}
- BM_CHECK_ELEMENT(bm, v);
+ BM_CHECK_ELEMENT(v);
return v;
}
@@ -122,7 +122,7 @@
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 @@
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 @@
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 @@
/* 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 @@
#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_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 @@
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 @@
} 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 @@
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 @@
* \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 @@
}
#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 @@
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 @@
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 @@
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 @@
}
}
- 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 @@
/* 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 @@
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 @@
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 @@
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 @@
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;
}
Modified: trunk/blender/source/blender/bmesh/intern/bmesh_interp.c
===================================================================
--- trunk/blender/source/blender/bmesh/intern/bmesh_interp.c 2012-04-19 13:59:03 UTC (rev 45784)
+++ trunk/blender/source/blender/bmesh/intern/bmesh_interp.c 2012-04-19 14:38:09 UTC (rev 45785)
@@ -327,16 +327,16 @@
/* 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 @@
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]);
Modified: trunk/blender/source/blender/bmesh/intern/bmesh_marking.c
===================================================================
--- trunk/blender/source/blender/bmesh/intern/bmesh_marking.c 2012-04-19 13:59:03 UTC (rev 45784)
+++ trunk/blender/source/blender/bmesh/intern/bmesh_marking.c 2012-04-19 14:38:09 UTC (rev 45785)
@@ -563,7 +563,7 @@
* - #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 @@
}
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 @@
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 @@
/***************** 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 @@
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 @@
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_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 @@
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 @@
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list