[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [44528] trunk/blender/source/blender: correction in last commit, also remove unneeded structs in functions definitions.
Campbell Barton
ideasman42 at gmail.com
Tue Feb 28 20:40:12 CET 2012
Revision: 44528
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=44528
Author: campbellbarton
Date: 2012-02-28 19:40:12 +0000 (Tue, 28 Feb 2012)
Log Message:
-----------
correction in last commit, also remove unneeded structs in functions definitions.
Modified Paths:
--------------
trunk/blender/source/blender/bmesh/intern/bmesh_construct.c
trunk/blender/source/blender/bmesh/intern/bmesh_core.c
trunk/blender/source/blender/bmesh/intern/bmesh_iterators.c
trunk/blender/source/blender/bmesh/intern/bmesh_marking.c
trunk/blender/source/blender/bmesh/intern/bmesh_mods.c
trunk/blender/source/blender/bmesh/intern/bmesh_operators.c
trunk/blender/source/blender/bmesh/intern/bmesh_queries.c
trunk/blender/source/blender/bmesh/intern/bmesh_structure.c
trunk/blender/source/blender/bmesh/intern/bmesh_structure.h
trunk/blender/source/blender/bmesh/tools/BME_bevel.c
trunk/blender/source/blender/editors/mesh/bmesh_select.c
Modified: trunk/blender/source/blender/bmesh/intern/bmesh_construct.c
===================================================================
--- trunk/blender/source/blender/bmesh/intern/bmesh_construct.c 2012-02-28 19:30:44 UTC (rev 44527)
+++ trunk/blender/source/blender/bmesh/intern/bmesh_construct.c 2012-02-28 19:40:12 UTC (rev 44528)
@@ -185,7 +185,7 @@
BLI_array_append(edges2, e);
do {
- e2 = bm_disk_edge_next(e2, v);
+ e2 = bmesh_disk_edge_next(e2, v);
if (e2 != e && BM_ELEM_API_FLAG_TEST(e2, _FLAG_MF)) {
v = BM_edge_other_vert(e2, v);
break;
Modified: trunk/blender/source/blender/bmesh/intern/bmesh_core.c
===================================================================
--- trunk/blender/source/blender/bmesh/intern/bmesh_core.c 2012-02-28 19:30:44 UTC (rev 44527)
+++ trunk/blender/source/blender/bmesh/intern/bmesh_core.c 2012-02-28 19:40:12 UTC (rev 44528)
@@ -52,7 +52,7 @@
#endif
-BMVert *BM_vert_create(BMesh *bm, const float co[3], const struct BMVert *example)
+BMVert *BM_vert_create(BMesh *bm, const float co[3], const BMVert *example)
{
BMVert *v = BLI_mempool_calloc(bm->vpool);
@@ -621,7 +621,7 @@
e = v->e;
while (v->e) {
- nexte = bm_disk_edge_next(e, v);
+ nexte = bmesh_disk_edge_next(e, v);
BM_edge_kill(bm, e);
e = nexte;
}
@@ -817,7 +817,7 @@
do {
i += BM_ELEM_API_FLAG_TEST(e, flag) ? 1 : 0;
- e = bm_disk_edge_next(e, v);
+ e = bmesh_disk_edge_next(e, v);
} while (e != v->e);
return i;
@@ -847,7 +847,7 @@
l = l->radial_next;
} while (l != e->l);
- e = bm_disk_edge_next(e, v);
+ e = bmesh_disk_edge_next(e, v);
} while (e != v->e);
return TRUE;
@@ -1429,7 +1429,7 @@
len = bmesh_disk_count(kv);
if (len == 2) {
- oe = bm_disk_edge_next(ke, kv);
+ oe = bmesh_disk_edge_next(ke, kv);
tv = bmesh_edge_other_vert_get(ke, kv);
ov = bmesh_edge_other_vert_get(oe, kv);
halt = bmesh_verts_in_edge(kv, tv, oe); /* check for double edge */
@@ -1946,7 +1946,7 @@
* will leave the original sv on some *other* fan (not the
* one-face fan that holds the unglue face). */
while (sv->e == sl->e || sv->e == sl->prev->e) {
- sv->e = bm_disk_edge_next(sv->e, sv);
+ sv->e = bmesh_disk_edge_next(sv->e, sv);
}
/* Split all fans connected to the vert, duplicating it for
Modified: trunk/blender/source/blender/bmesh/intern/bmesh_iterators.c
===================================================================
--- trunk/blender/source/blender/bmesh/intern/bmesh_iterators.c 2012-02-28 19:30:44 UTC (rev 44527)
+++ trunk/blender/source/blender/bmesh/intern/bmesh_iterators.c 2012-02-28 19:40:12 UTC (rev 44528)
@@ -53,7 +53,7 @@
/*
* note, we have BM_vert_at_index/BM_edge_at_index/BM_face_at_index for arrays
*/
-void *BM_iter_at_index(struct BMesh *bm, const char itype, void *data, int index)
+void *BM_iter_at_index(BMesh *bm, const char itype, void *data, int index)
{
BMIter iter;
void *val;
@@ -83,7 +83,7 @@
* to avoid multiple calls to BM_iter_at_index.
*/
-int BM_iter_as_array(struct BMesh *bm, const char type, void *data, void **array, const int len)
+int BM_iter_as_array(BMesh *bm, const char type, void *data, void **array, const int len)
{
int i = 0;
@@ -197,7 +197,7 @@
BMEdge *current = iter->nextedge;
if (iter->nextedge)
- iter->nextedge = bm_disk_edge_next(iter->nextedge, iter->vdata);
+ iter->nextedge = bmesh_disk_edge_next(iter->nextedge, iter->vdata);
if (iter->nextedge == iter->firstedge) iter->nextedge = NULL;
Modified: trunk/blender/source/blender/bmesh/intern/bmesh_marking.c
===================================================================
--- trunk/blender/source/blender/bmesh/intern/bmesh_marking.c 2012-02-28 19:30:44 UTC (rev 44527)
+++ trunk/blender/source/blender/bmesh/intern/bmesh_marking.c 2012-02-28 19:40:12 UTC (rev 44528)
@@ -452,7 +452,7 @@
/**
* counts number of elements with flag set
*/
-int BM_mesh_count_flag(struct BMesh *bm, const char htype, const char hflag, int respecthide)
+int BM_mesh_count_flag(BMesh *bm, const char htype, const char hflag, int respecthide)
{
BMElem *ele;
BMIter iter;
@@ -484,7 +484,7 @@
* \note use BM_elem_flag_test(ele, BM_ELEM_SELECT) to test selection
* \note by design, this will not touch the editselection history stuff
*/
-void _bm_elem_select_set(struct BMesh *bm, BMHeader *head, int select)
+void _bm_elem_select_set(BMesh *bm, BMHeader *head, int select)
{
switch (head->htype) {
case BM_VERT:
Modified: trunk/blender/source/blender/bmesh/intern/bmesh_mods.c
===================================================================
--- trunk/blender/source/blender/bmesh/intern/bmesh_mods.c 2012-02-28 19:30:44 UTC (rev 44527)
+++ trunk/blender/source/blender/bmesh/intern/bmesh_mods.c 2012-02-28 19:40:12 UTC (rev 44528)
@@ -113,7 +113,7 @@
/* v->e we keep, what else */
e = v->e;
do {
- e = bm_disk_edge_next(e, v);
+ e = bmesh_disk_edge_next(e, v);
if (!(BM_edge_share_face_count(e, v->e))) {
keepedge = e;
baseedge = v->e;
@@ -180,7 +180,7 @@
done = 0;
break;
}
- e = bm_disk_edge_next(e, v);
+ e = bmesh_disk_edge_next(e, v);
} while (e != v->e);
}
@@ -426,7 +426,7 @@
/* now interpolate the vertex data */
BM_data_interp_from_verts(bm, kv, tv, kv, fac);
- e2 = bm_disk_edge_next(ke, kv);
+ e2 = bmesh_disk_edge_next(ke, kv);
tv2 = BM_edge_other_vert(e2, kv);
if (join_faces) {
Modified: trunk/blender/source/blender/bmesh/intern/bmesh_operators.c
===================================================================
--- trunk/blender/source/blender/bmesh/intern/bmesh_operators.c 2012-02-28 19:30:44 UTC (rev 44527)
+++ trunk/blender/source/blender/bmesh/intern/bmesh_operators.c 2012-02-28 19:40:12 UTC (rev 44528)
@@ -338,7 +338,7 @@
}
/* only supports square mats */
-void BMO_slot_mat_set(struct BMOperator *op, const char *slotname, const float *mat, int size)
+void BMO_slot_mat_set(BMOperator *op, const char *slotname, const float *mat, int size)
{
BMOpSlot *slot = BMO_slot_get(op, slotname);
BLI_assert(slot->slottype == BMO_OP_SLOT_MAT);
@@ -361,7 +361,7 @@
}
}
-void BMO_slot_mat4_get(struct BMOperator *op, const char *slotname, float r_mat[4][4])
+void BMO_slot_mat4_get(BMOperator *op, const char *slotname, float r_mat[4][4])
{
BMOpSlot *slot = BMO_slot_get(op, slotname);
BLI_assert(slot->slottype == BMO_OP_SLOT_MAT);
@@ -371,7 +371,7 @@
copy_m4_m4(r_mat, (float (*)[4])slot->data.p);
}
-void BMO_slot_mat3_set(struct BMOperator *op, const char *slotname, float r_mat[3][3])
+void BMO_slot_mat3_set(BMOperator *op, const char *slotname, float r_mat[3][3])
{
BMOpSlot *slot = BMO_slot_get(op, slotname);
BLI_assert(slot->slottype == BMO_OP_SLOT_MAT);
@@ -510,7 +510,7 @@
}
}
-int BMO_slot_buf_count(struct BMesh *UNUSED(bm), struct BMOperator *op, const char *slotname)
+int BMO_slot_buf_count(BMesh *UNUSED(bm), BMOperator *op, const char *slotname)
{
BMOpSlot *slot = BMO_slot_get(op, slotname);
BLI_assert(slot->slottype > BMO_OP_SLOT_VEC);
@@ -603,7 +603,7 @@
}
#endif
-void BMO_slot_map_to_flag(struct BMesh *bm, struct BMOperator *op,
+void BMO_slot_map_to_flag(BMesh *bm, BMOperator *op,
const char *slotname, const short oflag)
{
GHashIterator it;
@@ -859,7 +859,7 @@
for (i = 0, curedge = v->e; i < len; i++) {
if (BMO_elem_flag_test(bm, curedge, oflag))
count++;
- curedge = bm_disk_edge_next(curedge, v);
+ curedge = bmesh_disk_edge_next(curedge, v);
}
}
@@ -1096,7 +1096,7 @@
return h;
}
else if (iter->slot->slottype == BMO_OP_SLOT_MAPPING) {
- struct BMOElemMapping *map;
+ BMOElemMapping *map;
void *ret = BLI_ghashIterator_getKey(&iter->giter);
map = BLI_ghashIterator_getValue(&iter->giter);
Modified: trunk/blender/source/blender/bmesh/intern/bmesh_queries.c
===================================================================
--- trunk/blender/source/blender/bmesh/intern/bmesh_queries.c 2012-02-28 19:30:44 UTC (rev 44527)
+++ trunk/blender/source/blender/bmesh/intern/bmesh_queries.c 2012-02-28 19:40:12 UTC (rev 44528)
@@ -262,7 +262,7 @@
return FALSE;
}
- curedge = bm_disk_edge_next(curedge, v);
+ curedge = bmesh_disk_edge_next(curedge, v);
} while (curedge != v->e);
return TRUE;
@@ -297,7 +297,7 @@
/* count edges while looking for non-manifold edges */
oe = v->e;
- for (len = 0, e = v->e; e != oe || (e == oe && len == 0); len++, e = bm_disk_edge_next(e, v)) {
+ for (len = 0, e = v->e; e != oe || (e == oe && len == 0); len++, e = bmesh_disk_edge_next(e, v)) {
if (e->l == NULL) {
/* loose edge */
return FALSE;
@@ -413,7 +413,7 @@
/**
* Tests to see if e1 shares a vertex with e2
*/
-int BM_edge_share_vert_count(struct BMEdge *e1, struct BMEdge *e2)
+int BM_edge_share_vert_count(BMEdge *e1, BMEdge *e2)
{
return (e1->v1 == e2->v1 ||
e1->v1 == e2->v2 ||
@@ -424,7 +424,7 @@
/**
* Return the shared vertex between the two edges or NULL
*/
-BMVert *BM_edge_share_vert(struct BMEdge *e1, struct BMEdge *e2)
+BMVert *BM_edge_share_vert(BMEdge *e1, BMEdge *e2)
{
if (BM_vert_in_edge(e2, e1->v1)) {
return e1->v1;
@@ -507,9 +507,9 @@
* get the edges and count them both at once */
if ((e1 = v->e) &&
- (e2 = bm_disk_edge_next(e1, v)) &&
+ (e2 = bmesh_disk_edge_next(e1, v)) &&
/* make sure we come full circle and only have 2 connected edges */
- (e1 == bm_disk_edge_next(e2, v)))
+ (e1 == bmesh_disk_edge_next(e2, v)))
{
BMVert *v1 = BM_edge_other_vert(e1, v);
BMVert *v2 = BM_edge_other_vert(e2, v);
Modified: trunk/blender/source/blender/bmesh/intern/bmesh_structure.c
===================================================================
--- trunk/blender/source/blender/bmesh/intern/bmesh_structure.c 2012-02-28 19:30:44 UTC (rev 44527)
+++ trunk/blender/source/blender/bmesh/intern/bmesh_structure.c 2012-02-28 19:40:12 UTC (rev 44528)
@@ -150,7 +150,7 @@
* cycle order and all non-manifold conditions are represented trivially.
*
*/
-int bmesh_disk_edge_append(struct BMEdge *e, struct BMVert *v)
+int bmesh_disk_edge_append(BMEdge *e, BMVert *v)
{
if (!v->e) {
BMDiskLink *dl1 = BM_DISK_EDGE_LINK_GET(e, v);
@@ -176,7 +176,7 @@
return TRUE;
}
-void bmesh_disk_edge_remove(struct BMEdge *e, struct BMVert *v)
+void bmesh_disk_edge_remove(BMEdge *e, BMVert *v)
{
BMDiskLink *dl1, *dl2;
@@ -206,7 +206,7 @@
* Pointer to the next edge in the disk cycle for the vertex v.
*/
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list