[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [44989] trunk/blender/source/blender: code cleanup: bmesh api - make arg order consistent - htype before hflag or oflag.
Campbell Barton
ideasman42 at gmail.com
Mon Mar 19 09:36:40 CET 2012
Revision: 44989
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=44989
Author: campbellbarton
Date: 2012-03-19 08:36:27 +0000 (Mon, 19 Mar 2012)
Log Message:
-----------
code cleanup: bmesh api - make arg order consistent - htype before hflag or oflag.
Modified Paths:
--------------
trunk/blender/source/blender/bmesh/bmesh_operator_api.h
trunk/blender/source/blender/bmesh/intern/bmesh_operators.c
trunk/blender/source/blender/bmesh/operators/bmo_bevel.c
trunk/blender/source/blender/bmesh/operators/bmo_connect.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_dupe.c
trunk/blender/source/blender/bmesh/operators/bmo_edgesplit.c
trunk/blender/source/blender/bmesh/operators/bmo_extrude.c
trunk/blender/source/blender/bmesh/operators/bmo_inset.c
trunk/blender/source/blender/bmesh/operators/bmo_mirror.c
trunk/blender/source/blender/bmesh/operators/bmo_primitive.c
trunk/blender/source/blender/bmesh/operators/bmo_removedoubles.c
trunk/blender/source/blender/bmesh/operators/bmo_subdivide.c
trunk/blender/source/blender/bmesh/operators/bmo_triangulate.c
trunk/blender/source/blender/bmesh/operators/bmo_utils.c
trunk/blender/source/blender/editors/mesh/bmesh_select.c
trunk/blender/source/blender/editors/mesh/bmesh_tools.c
trunk/blender/source/blender/editors/mesh/bmesh_utils.c
trunk/blender/source/blender/editors/mesh/knifetool.c
Modified: trunk/blender/source/blender/bmesh/bmesh_operator_api.h
===================================================================
--- trunk/blender/source/blender/bmesh/bmesh_operator_api.h 2012-03-19 07:57:35 UTC (rev 44988)
+++ trunk/blender/source/blender/bmesh/bmesh_operator_api.h 2012-03-19 08:36:27 UTC (rev 44989)
@@ -184,7 +184,7 @@
/* count the number of elements with a specific flag.
* type can be a bitmask of BM_FACE, BM_EDGE, or BM_FACE. */
-int BMO_mesh_flag_count(BMesh *bm, const short oflag, const char htype);
+int BMO_mesh_flag_count(BMesh *bm, const char htype, const short oflag);
/*---------formatted operator initialization/execution-----------*/
/*
@@ -292,27 +292,27 @@
/* puts every element of type type (which is a bitmask) with tool flag flag,
* into a slot. */
void BMO_slot_buffer_from_flag(BMesh *bm, BMOperator *op, const char *slotname,
- const short oflag, const char htype);
+ const char htype, const short oflag);
/* tool-flags all elements inside an element slot array with flag flag. */
void BMO_slot_buffer_flag_enable(BMesh *bm, BMOperator *op, const char *slotname,
- const short oflag, const char htype);
+ const char htype, const short oflag);
/* clears tool-flag flag from all elements inside a slot array. */
void BMO_slot_buffer_flag_disable(BMesh *bm, BMOperator *op, const char *slotname,
- const short oflag, const char htype);
+ const char htype, const short oflag);
/* tool-flags all elements inside an element slot array with flag flag. */
void BMO_slot_buffer_hflag_enable(BMesh *bm, BMOperator *op, const char *slotname,
- const char hflag, const char htype, const char do_flush);
+ const char htype, const char hflag, const char do_flush);
/* clears tool-flag flag from all elements inside a slot array. */
void BMO_slot_buffer_hflag_disable(BMesh *bm, BMOperator *op, const char *slotname,
- const char hflag, const char htype, const char do_flush);
+ const char htype, const char hflag, const char do_flush);
/* puts every element of type type (which is a bitmask) with header flag
* flag, into a slot. note: ignores hidden elements (e.g. elements with
* header flag BM_ELEM_HIDDEN set).*/
void BMO_slot_buffer_from_hflag(BMesh *bm, BMOperator *op, const char *slotname,
- const char hflag, const char htype);
+ const char htype, const char hflag);
/* counts number of elements inside a slot array. */
int BMO_slot_buffer_count(BMesh *bm, BMOperator *op, const char *slotname);
@@ -328,7 +328,7 @@
/* flags all elements in a mapping. note that the mapping must only have
* bmesh elements in it.*/
void BMO_slot_map_to_flag(BMesh *bm, BMOperator *op, const char *slotname,
- const short oflag, const char hflag);
+ const char hflag, const short oflag);
/* this part of the API is used to iterate over element buffer or
* mapping slots.
Modified: trunk/blender/source/blender/bmesh/intern/bmesh_operators.c
===================================================================
--- trunk/blender/source/blender/bmesh/intern/bmesh_operators.c 2012-03-19 07:57:35 UTC (rev 44988)
+++ trunk/blender/source/blender/bmesh/intern/bmesh_operators.c 2012-03-19 08:36:27 UTC (rev 44989)
@@ -455,7 +455,7 @@
*
*/
-int BMO_mesh_flag_count(BMesh *bm, const short oflag, const char htype)
+int BMO_mesh_flag_count(BMesh *bm, const char htype, const short oflag)
{
BMIter elements;
int count = 0;
@@ -596,7 +596,7 @@
#endif
void BMO_slot_map_to_flag(BMesh *bm, BMOperator *op, const char *slotname,
- const short oflag, const char htype)
+ const char htype, const short oflag)
{
GHashIterator it;
BMOpSlot *slot = BMO_slot_get(op, slotname);
@@ -679,7 +679,7 @@
* into a slot for an operator.
*/
void BMO_slot_buffer_from_hflag(BMesh *bm, BMOperator *op, const char *slotname,
- const char hflag, const char htype)
+ const char htype, const char hflag)
{
BMIter elements;
BMElem *ele;
@@ -730,11 +730,11 @@
* into an output slot for an operator.
*/
void BMO_slot_buffer_from_flag(BMesh *bm, BMOperator *op, const char *slotname,
- const short oflag, const char htype)
+ const char htype, const short oflag)
{
BMIter elements;
BMOpSlot *slot = BMO_slot_get(op, slotname);
- int totelement = BMO_mesh_flag_count(bm, oflag, htype), i = 0;
+ int totelement = BMO_mesh_flag_count(bm, htype, oflag), i = 0;
BLI_assert(slot->slottype == BMO_OP_SLOT_ELEMENT_BUF);
@@ -785,7 +785,7 @@
* using the selection API where appropriate.
*/
void BMO_slot_buffer_hflag_enable(BMesh *bm, BMOperator *op, const char *slotname,
- const char hflag, const char htype, const char do_flush)
+ const char htype, const char hflag, const char do_flush)
{
BMOpSlot *slot = BMO_slot_get(op, slotname);
BMElem **data = slot->data.p;
@@ -818,7 +818,7 @@
* using the selection API where appropriate.
*/
void BMO_slot_buffer_hflag_disable(BMesh *bm, BMOperator *op, const char *slotname,
- const char hflag, const char htype, const char do_flush)
+ const char htype, const char hflag, const char do_flush)
{
BMOpSlot *slot = BMO_slot_get(op, slotname);
BMElem **data = slot->data.p;
@@ -869,7 +869,7 @@
* Flags elements in a slots buffer
*/
void BMO_slot_buffer_flag_enable(BMesh *bm, BMOperator *op, const char *slotname,
- const short oflag, const char htype)
+ const char htype, const short oflag)
{
BMOpSlot *slot = BMO_slot_get(op, slotname);
BMHeader **data = slot->data.p;
@@ -891,7 +891,7 @@
* Removes flags from elements in a slots buffer
*/
void BMO_slot_buffer_flag_disable(BMesh *bm, BMOperator *op, const char *slotname,
- const short oflag, const char htype)
+ const char htype, const short oflag)
{
BMOpSlot *slot = BMO_slot_get(op, slotname);
BMHeader **data = slot->data.p;
@@ -1245,7 +1245,8 @@
BMOpDefine *def;
char *opname, *ofmt, *fmt;
char slotname[64] = {0};
- int i /*, n = strlen(fmt) */, stop /*, slotcode = -1 */, ret, type, state;
+ int i /*, n = strlen(fmt) */, stop /*, slotcode = -1 */, type, state;
+ char htype;
int noslot = 0;
@@ -1380,13 +1381,13 @@
BMO_slot_float_set(op, slotname, va_arg(vlist, double));
}
else {
- ret = 0;
+ htype = 0;
stop = 0;
while (1) {
switch (NEXT_CHAR(fmt)) {
- case 'f': ret |= BM_FACE; break;
- case 'e': ret |= BM_EDGE; break;
- case 'v': ret |= BM_VERT; break;
+ case 'f': htype |= BM_FACE; break;
+ case 'e': htype |= BM_EDGE; break;
+ case 'v': htype |= BM_VERT; break;
default:
stop = 1;
break;
@@ -1399,13 +1400,13 @@
}
if (type == 'h') {
- BMO_slot_buffer_from_hflag(bm, op, slotname, va_arg(vlist, int), ret);
+ BMO_slot_buffer_from_hflag(bm, op, slotname, htype, va_arg(vlist, int));
}
else if (type == 'a') {
- BMO_slot_buffer_from_all(bm, op, slotname, ret);
+ BMO_slot_buffer_from_all(bm, op, slotname, htype);
}
else {
- BMO_slot_buffer_from_flag(bm, op, slotname, va_arg(vlist, int), ret);
+ BMO_slot_buffer_from_flag(bm, op, slotname, htype, va_arg(vlist, int));
}
}
Modified: trunk/blender/source/blender/bmesh/operators/bmo_bevel.c
===================================================================
--- trunk/blender/source/blender/bmesh/operators/bmo_bevel.c 2012-03-19 07:57:35 UTC (rev 44988)
+++ trunk/blender/source/blender/bmesh/operators/bmo_bevel.c 2012-03-19 08:36:27 UTC (rev 44989)
@@ -877,6 +877,6 @@
BLI_array_free(edges);
BLI_array_free(faces);
- BMO_slot_buffer_from_flag(bm, op, "face_spans", FACE_SPAN, BM_FACE);
- BMO_slot_buffer_from_flag(bm, op, "face_holes", FACE_HOLE, BM_FACE);
+ BMO_slot_buffer_from_flag(bm, op, "face_spans", BM_FACE, FACE_SPAN);
+ BMO_slot_buffer_from_flag(bm, op, "face_holes", BM_FACE, FACE_HOLE);
}
Modified: trunk/blender/source/blender/bmesh/operators/bmo_connect.c
===================================================================
--- trunk/blender/source/blender/bmesh/operators/bmo_connect.c 2012-03-19 07:57:35 UTC (rev 44988)
+++ trunk/blender/source/blender/bmesh/operators/bmo_connect.c 2012-03-19 08:36:27 UTC (rev 44989)
@@ -45,7 +45,7 @@
BLI_array_declare(verts);
int i;
- BMO_slot_buffer_flag_enable(bm, op, "verts", VERT_INPUT, BM_VERT);
+ BMO_slot_buffer_flag_enable(bm, op, "verts", BM_VERT, VERT_INPUT);
for (f = BM_iter_new(&iter, bm, BM_FACES_OF_MESH, NULL); f; f = BM_iter_step(&iter)) {
BLI_array_empty(loops);
@@ -116,7 +116,7 @@
}
}
- BMO_slot_buffer_from_flag(bm, op, "edgeout", EDGE_OUT, BM_EDGE);
+ BMO_slot_buffer_from_flag(bm, op, "edgeout", BM_EDGE, EDGE_OUT);
BLI_array_free(loops);
BLI_array_free(verts);
@@ -208,7 +208,7 @@
BMEdge *e, *nexte;
int c = 0, cl1 = 0, cl2 = 0;
- BMO_slot_buffer_flag_enable(bm, op, "edges", EDGE_MARK, BM_EDGE);
+ BMO_slot_buffer_flag_enable(bm, op, "edges", BM_EDGE, EDGE_MARK);
BMO_ITER(e, &siter, bm, op, "edges", BM_EDGE) {
if (!BMO_elem_flag_test(bm, e, EDGE_DONE)) {
Modified: trunk/blender/source/blender/bmesh/operators/bmo_create.c
===================================================================
--- trunk/blender/source/blender/bmesh/operators/bmo_create.c 2012-03-19 07:57:35 UTC (rev 44988)
+++ trunk/blender/source/blender/bmesh/operators/bmo_create.c 2012-03-19 08:36:27 UTC (rev 44989)
@@ -904,8 +904,8 @@
edata = MEM_callocN(sizeof(EdgeData) * bm->totedge, "EdgeData");
vdata = MEM_callocN(sizeof(VertData) * bm->totvert, "VertData");
- BMO_slot_buffer_flag_enable(bm, op, "edges", EDGE_MARK, BM_EDGE);
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list