[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [45078] trunk/blender/source/blender: code cleanup: remove BMesh * args from query functions which don't need it
Campbell Barton
ideasman42 at gmail.com
Thu Mar 22 08:53:21 CET 2012
Revision: 45078
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=45078
Author: campbellbarton
Date: 2012-03-22 07:53:11 +0000 (Thu, 22 Mar 2012)
Log Message:
-----------
code cleanup: remove BMesh * args from query functions which don't need it
Modified Paths:
--------------
trunk/blender/source/blender/bmesh/intern/bmesh_construct.c
trunk/blender/source/blender/bmesh/intern/bmesh_mods.c
trunk/blender/source/blender/bmesh/intern/bmesh_queries.c
trunk/blender/source/blender/bmesh/intern/bmesh_queries.h
trunk/blender/source/blender/bmesh/intern/bmesh_walkers_impl.c
trunk/blender/source/blender/bmesh/operators/bmo_dissolve.c
trunk/blender/source/blender/bmesh/operators/bmo_extrude.c
trunk/blender/source/blender/bmesh/tools/BME_bevel.c
trunk/blender/source/blender/editors/mesh/bmesh_select.c
trunk/blender/source/blender/python/bmesh/bmesh_py_types.c
Modified: trunk/blender/source/blender/bmesh/intern/bmesh_construct.c
===================================================================
--- trunk/blender/source/blender/bmesh/intern/bmesh_construct.c 2012-03-22 07:26:09 UTC (rev 45077)
+++ trunk/blender/source/blender/bmesh/intern/bmesh_construct.c 2012-03-22 07:53:11 UTC (rev 45078)
@@ -966,7 +966,7 @@
((hflag & BM_ELEM_SEAM) ? ME_SEAM : 0) |
((hflag & BM_ELEM_SMOOTH) == 0 ? ME_SHARP : 0) |
((hflag & BM_ELEM_HIDDEN) ? ME_HIDE : 0) |
- ((BM_edge_is_wire(NULL, eed)) ? ME_LOOSEEDGE : 0) | /* not typical */
+ ((BM_edge_is_wire(eed)) ? ME_LOOSEEDGE : 0) | /* not typical */
(ME_EDGEDRAW | ME_EDGERENDER)
);
}
Modified: trunk/blender/source/blender/bmesh/intern/bmesh_mods.c
===================================================================
--- trunk/blender/source/blender/bmesh/intern/bmesh_mods.c 2012-03-22 07:26:09 UTC (rev 45077)
+++ trunk/blender/source/blender/bmesh/intern/bmesh_mods.c 2012-03-22 07:53:11 UTC (rev 45078)
@@ -71,7 +71,7 @@
BM_vert_kill(bm, v); /* will kill edges too */
return TRUE;
}
- else if (!BM_vert_is_manifold(bm, v)) {
+ else if (!BM_vert_is_manifold(v)) {
if (!v->e) {
BM_vert_kill(bm, v);
return TRUE;
@@ -108,7 +108,7 @@
BMEdge *e, *keepedge = NULL, *baseedge = NULL;
int len = 0;
- if (!BM_vert_is_manifold(bm, v)) {
+ if (!BM_vert_is_manifold(v)) {
return FALSE;
}
Modified: trunk/blender/source/blender/bmesh/intern/bmesh_queries.c
===================================================================
--- trunk/blender/source/blender/bmesh/intern/bmesh_queries.c 2012-03-22 07:26:09 UTC (rev 45077)
+++ trunk/blender/source/blender/bmesh/intern/bmesh_queries.c 2012-03-22 07:53:11 UTC (rev 45078)
@@ -389,7 +389,7 @@
* Tests whether or not the vertex is part of a wire edge.
* (ie: has no faces attached to it)
*/
-int BM_vert_is_wire(BMesh *UNUSED(bm), BMVert *v)
+int BM_vert_is_wire(BMVert *v)
{
BMEdge *curedge;
@@ -413,7 +413,7 @@
* Tests whether or not the edge is part of a wire.
* (ie: has no faces attached to it)
*/
-int BM_edge_is_wire(BMesh *UNUSED(bm), BMEdge *e)
+int BM_edge_is_wire(BMEdge *e)
{
return (e->l) ? FALSE : TRUE;
}
@@ -425,7 +425,7 @@
* 3: Is part of a non-manifold edge (edge with more than 2 faces)
* 4: Is part of a wire edge
*/
-int BM_vert_is_manifold(BMesh *UNUSED(bm), BMVert *v)
+int BM_vert_is_manifold(BMVert *v)
{
BMEdge *e, *oe;
BMLoop *l;
@@ -491,14 +491,14 @@
*/
#if 1 /* fast path for checking manifold */
-int BM_edge_is_manifold(BMesh *UNUSED(bm), BMEdge *e)
+int BM_edge_is_manifold(BMEdge *e)
{
const BMLoop *l = e->l;
return (l && ((l->radial_next == l) || /* 1 face user */
(l->radial_next->radial_next == l))); /* 2 face users */
}
#else
-int BM_edge_is_manifold(BMesh *UNUSED(bm), BMEdge *e)
+int BM_edge_is_manifold(BMEdge *e)
{
int count = BM_edge_face_count(e);
if (count == 2 || count == 1) {
@@ -662,7 +662,7 @@
*
* \return angle in radians
*/
-float BM_loop_face_angle(BMesh *UNUSED(bm), BMLoop *l)
+float BM_loop_face_angle(BMLoop *l)
{
return angle_v3v3v3(l->prev->v->co,
l->v->co,
@@ -678,7 +678,7 @@
* \param l The loop to calculate the normal at
* \param r_normal Resulting normal
*/
-void BM_loop_face_normal(BMesh *UNUSED(bm), BMLoop *l, float r_normal[3])
+void BM_loop_face_normal(BMLoop *l, float r_normal[3])
{
if (normal_tri_v3(r_normal,
l->prev->v->co,
@@ -702,7 +702,7 @@
* \param l The loop to calculate the tangent at
* \param r_tangent Resulting tangent
*/
-void BM_loop_face_tangent(BMesh *UNUSED(bm), BMLoop *l, float r_tangent[3])
+void BM_loop_face_tangent(BMLoop *l, float r_tangent[3])
{
float v_prev[3];
float v_next[3];
@@ -736,7 +736,7 @@
*
* \return angle in radians
*/
-float BM_edge_face_angle(BMesh *UNUSED(bm), BMEdge *e)
+float BM_edge_face_angle(BMEdge *e)
{
if (BM_edge_face_count(e) == 2) {
BMLoop *l1 = e->l;
@@ -755,7 +755,7 @@
*
* \returns the angle in radians
*/
-float BM_vert_edge_angle(BMesh *UNUSED(bm), BMVert *v)
+float BM_vert_edge_angle(BMVert *v)
{
BMEdge *e1, *e2;
Modified: trunk/blender/source/blender/bmesh/intern/bmesh_queries.h
===================================================================
--- trunk/blender/source/blender/bmesh/intern/bmesh_queries.h 2012-03-22 07:26:09 UTC (rev 45077)
+++ trunk/blender/source/blender/bmesh/intern/bmesh_queries.h 2012-03-22 07:53:11 UTC (rev 45078)
@@ -49,19 +49,19 @@
int BM_edge_face_count(BMEdge *e);
int BM_vert_face_count(BMVert *v);
-int BM_vert_is_wire(BMesh *bm, BMVert *v);
-int BM_edge_is_wire(BMesh *bm, BMEdge *e);
+int BM_vert_is_wire(BMVert *v);
+int BM_edge_is_wire(BMEdge *e);
-int BM_vert_is_manifold(BMesh *bm, BMVert *v);
-int BM_edge_is_manifold(BMesh *bm, BMEdge *e);
+int BM_vert_is_manifold(BMVert *v);
+int BM_edge_is_manifold(BMEdge *e);
int BM_edge_is_boundary(BMEdge *e);
-float BM_loop_face_angle(BMesh *bm, BMLoop *l);
-void BM_loop_face_normal(BMesh *bm, BMLoop *l, float r_normal[3]);
-void BM_loop_face_tangent(BMesh *bm, BMLoop *l, float r_tangent[3]);
+float BM_loop_face_angle(BMLoop *l);
+void BM_loop_face_normal(BMLoop *l, float r_normal[3]);
+void BM_loop_face_tangent(BMLoop *l, float r_tangent[3]);
-float BM_edge_face_angle(BMesh *bm, BMEdge *e);
-float BM_vert_edge_angle(BMesh *bm, BMVert *v);
+float BM_edge_face_angle(BMEdge *e);
+float BM_vert_edge_angle(BMVert *v);
BMEdge *BM_edge_exists(BMVert *v1, BMVert *v2);
Modified: trunk/blender/source/blender/bmesh/intern/bmesh_walkers_impl.c
===================================================================
--- trunk/blender/source/blender/bmesh/intern/bmesh_walkers_impl.c 2012-03-22 07:26:09 UTC (rev 45077)
+++ trunk/blender/source/blender/bmesh/intern/bmesh_walkers_impl.c 2012-03-22 07:53:11 UTC (rev 45078)
@@ -258,7 +258,7 @@
v = BM_edge_other_vert(e, iwalk->lastv);
- if (!BM_vert_is_manifold(walker->bm, v)) {
+ if (!BM_vert_is_manifold(v)) {
BMW_reset(walker);
BMO_error_raise(walker->bm, NULL, BMERR_WALKER_FAILED,
"Non-manifold vert "
@@ -604,10 +604,8 @@
/* Check whether the face loop can start from the given edge */
static int bmw_FaceLoopWalker_edge_begins_loop(BMWalker *walker, BMEdge *e)
{
- BMesh *bm = walker->bm;
-
/* There is no face loop starting from a wire edge */
- if (BM_edge_is_wire(bm, e)) {
+ if (BM_edge_is_wire(e)) {
return FALSE;
}
@@ -620,7 +618,7 @@
}
/* Don't start a face loop from non-manifold edges */
- if (!BM_edge_is_manifold(bm, e)) {
+ if (!BM_edge_is_manifold(e)) {
return FALSE;
}
@@ -785,7 +783,6 @@
BMwEdgeringWalker *lwalk = BMW_current_state(walker);
BMEdge *e;
BMLoop *l = lwalk->l /* , *origl = lwalk->l */;
- BMesh *bm = walker->bm;
#ifdef BMW_EDGERING_NGON
int i, len;
#endif
@@ -796,7 +793,7 @@
return lwalk->wireedge;
e = l->e;
- if (!BM_edge_is_manifold(bm, e)) {
+ if (!BM_edge_is_manifold(e)) {
/* walker won't traverse to a non-manifold edge, but may
* be started on one, and should not traverse *away* from
* a non-manfold edge (non-manifold edges are never in an
@@ -813,7 +810,7 @@
i -= 2;
}
- if ((len <= 0) || (len % 2 != 0) || !BM_edge_is_manifold(bm, l->e)) {
+ if ((len <= 0) || (len % 2 != 0) || !BM_edge_is_manifold(l->e)) {
l = lwalk->l;
i = len;
while (i > 0) {
@@ -822,7 +819,7 @@
}
}
/* only walk to manifold edge */
- if ((l->f->len % 2 == 0) && BM_edge_is_manifold(bm, l->e) &&
+ if ((l->f->len % 2 == 0) && BM_edge_is_manifold(l->e) &&
!BLI_ghash_haskey(walker->visithash, l->e))
#else
@@ -830,11 +827,11 @@
l = l->radial_next;
l = l->next->next;
- if ((l->f->len != 4) || !BM_edge_is_manifold(bm, l->e)) {
+ if ((l->f->len != 4) || !BM_edge_is_manifold(l->e)) {
l = lwalk->l->next->next;
}
/* only walk to manifold edge */
- if ((l->f->len == 4) && BM_edge_is_manifold(bm, l->e) &&
+ if ((l->f->len == 4) && BM_edge_is_manifold(l->e) &&
!BLI_ghash_haskey(walker->visithash, l->e))
#endif
{
Modified: trunk/blender/source/blender/bmesh/operators/bmo_dissolve.c
===================================================================
--- trunk/blender/source/blender/bmesh/operators/bmo_dissolve.c 2012-03-22 07:26:09 UTC (rev 45077)
+++ trunk/blender/source/blender/bmesh/operators/bmo_dissolve.c 2012-03-22 07:53:11 UTC (rev 45078)
@@ -493,7 +493,7 @@
/* 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(bm, e);
+ const float angle = BM_edge_face_angle(e);
if (angle < angle_limit) {
weight_elems[i].ele = (BMHeader *)e;
@@ -512,7 +512,7 @@
for (i = 0; i < tot_found; i++) {
BMEdge *e = (BMEdge *)weight_elems[i].ele;
/* check twice because cumulative effect could disolve over angle limit */
- if (BM_edge_face_angle(bm, e) < angle_limit) {
+ if (BM_edge_face_angle(e) < angle_limit) {
BMFace *nf = BM_faces_join_pair(bm, e->l->f,
e->l->radial_next->f,
e); /* join faces */
@@ -528,7 +528,7 @@
/* --- second verts --- */
for (i = 0, tot_found = 0; i < vinput->len; i++) {
BMVert *v = ((BMVert **)vinput->data.p)[i];
- const float angle = BM_vert_edge_angle(bm, v);
+ const float angle = BM_vert_edge_angle(v);
if (angle < angle_limit) {
weight_elems[i].ele = (BMHeader *)v;
@@ -547,7 +547,7 @@
for (i = 0; i < tot_found; i++) {
BMVert *v = (BMVert *)weight_elems[i].ele;
/* check twice because cumulative effect could disolve over angle limit */
- if (BM_vert_edge_angle(bm, v) < angle_limit) {
+ if (BM_vert_edge_angle(v) < angle_limit) {
BM_vert_collapse_edge(bm, v->e, v, TRUE); /* join edges */
}
}
Modified: trunk/blender/source/blender/bmesh/operators/bmo_extrude.c
===================================================================
--- trunk/blender/source/blender/bmesh/operators/bmo_extrude.c 2012-03-22 07:26:09 UTC (rev 45077)
+++ trunk/blender/source/blender/bmesh/operators/bmo_extrude.c 2012-03-22 07:53:11 UTC (rev 45078)
@@ -341,7 +341,7 @@
for ( ; e; e = BMO_iter_step(&siter)) {
/* this should always be wire, so this is mainly a speedup to avoid map lookup */
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list