[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [43957] branches/bmesh/blender/source/ blender/bmesh: Code Cleanup:
Campbell Barton
ideasman42 at gmail.com
Tue Feb 7 16:11:36 CET 2012
Revision: 43957
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=43957
Author: campbellbarton
Date: 2012-02-07 15:11:34 +0000 (Tue, 07 Feb 2012)
Log Message:
-----------
Code Cleanup:
rename BM_remove_tagged_* --> BMO_remove_tagged_*
also make the delete flag to check into an argument.
Modified Paths:
--------------
branches/bmesh/blender/source/blender/bmesh/bmesh_operator_api.h
branches/bmesh/blender/source/blender/bmesh/intern/bmesh_construct.c
branches/bmesh/blender/source/blender/bmesh/operators/bmesh_dupeops.c
Modified: branches/bmesh/blender/source/blender/bmesh/bmesh_operator_api.h
===================================================================
--- branches/bmesh/blender/source/blender/bmesh/bmesh_operator_api.h 2012-02-07 15:04:56 UTC (rev 43956)
+++ branches/bmesh/blender/source/blender/bmesh/bmesh_operator_api.h 2012-02-07 15:11:34 UTC (rev 43957)
@@ -252,9 +252,9 @@
const char *src, const char *dst);
/* remove tool flagged elements */
-void BM_remove_tagged_faces(struct BMesh *bm, const short oflag);
-void BM_remove_tagged_edges(struct BMesh *bm, const short oflag);
-void BM_remove_tagged_verts(struct BMesh *bm, const short oflag);
+void BMO_remove_tagged_faces(struct BMesh *bm, const short oflag);
+void BMO_remove_tagged_edges(struct BMesh *bm, const short oflag);
+void BMO_remove_tagged_verts(struct BMesh *bm, const short oflag);
void BMO_Set_OpFlag(struct BMesh *bm, struct BMOperator *op, const int op_flag);
void BMO_Clear_OpFlag(struct BMesh *bm, struct BMOperator *op, const int op_flag);
Modified: branches/bmesh/blender/source/blender/bmesh/intern/bmesh_construct.c
===================================================================
--- branches/bmesh/blender/source/blender/bmesh/intern/bmesh_construct.c 2012-02-07 15:04:56 UTC (rev 43956)
+++ branches/bmesh/blender/source/blender/bmesh/intern/bmesh_construct.c 2012-02-07 15:11:34 UTC (rev 43957)
@@ -368,7 +368,7 @@
*
*/
-void BM_remove_tagged_faces(BMesh *bm, const short oflag)
+void BMO_remove_tagged_faces(BMesh *bm, const short oflag)
{
BMFace *f;
BMIter iter;
@@ -380,7 +380,7 @@
}
}
-void BM_remove_tagged_edges(BMesh *bm, const short oflag)
+void BMO_remove_tagged_edges(BMesh *bm, const short oflag)
{
BMEdge *e;
BMIter iter;
@@ -392,7 +392,7 @@
}
}
-void BM_remove_tagged_verts(BMesh *bm, const short oflag)
+void BMO_remove_tagged_verts(BMesh *bm, const short oflag)
{
BMVert *v;
BMIter iter;
Modified: branches/bmesh/blender/source/blender/bmesh/operators/bmesh_dupeops.c
===================================================================
--- branches/bmesh/blender/source/blender/bmesh/operators/bmesh_dupeops.c 2012-02-07 15:04:56 UTC (rev 43956)
+++ branches/bmesh/blender/source/blender/bmesh/operators/bmesh_dupeops.c 2012-02-07 15:11:34 UTC (rev 43957)
@@ -437,8 +437,8 @@
#define DEL_INPUT 1
#define DEL_WIREVERT 2
-static void delete_verts(BMesh *bm);
-static void delete_context(BMesh *bm, int type);
+static void delete_verts(BMesh *bm, const short oflag);
+static void delete_context(BMesh *bm, const short oflag, const int type);
void delop_exec(BMesh *bm, BMOperator *op)
{
@@ -447,10 +447,10 @@
/* Mark Buffer */
BMO_Flag_Buffer(bm, delop, "geom", DEL_INPUT, BM_ALL);
- delete_context(bm, BMO_Get_Int(op, "context"));
+ delete_context(bm, DEL_INPUT, BMO_Get_Int(op, "context"));
}
-static void delete_verts(BMesh *bm)
+static void delete_verts(BMesh *bm, const short oflag)
{
BMVert *v;
BMEdge *e;
@@ -461,22 +461,22 @@
BMIter faces;
for (v = BMIter_New(&verts, bm, BM_VERTS_OF_MESH, bm); v; v = BMIter_Step(&verts)) {
- if (BMO_TestFlag(bm, (BMHeader *)v, DEL_INPUT)) {
+ if (BMO_TestFlag(bm, (BMHeader *)v, oflag)) {
/* Visit edge */
for (e = BMIter_New(&edges, bm, BM_EDGES_OF_VERT, v); e; e = BMIter_Step(&edges))
- BMO_SetFlag(bm, (BMHeader *)e, DEL_INPUT);
+ BMO_SetFlag(bm, (BMHeader *)e, oflag);
/* Visit face */
for (f = BMIter_New(&faces, bm, BM_FACES_OF_VERT, v); f; f = BMIter_Step(&faces))
- BMO_SetFlag(bm, (BMHeader *)f, DEL_INPUT);
+ BMO_SetFlag(bm, (BMHeader *)f, oflag);
}
}
- BM_remove_tagged_faces(bm, DEL_INPUT);
- BM_remove_tagged_edges(bm, DEL_INPUT);
- BM_remove_tagged_verts(bm, DEL_INPUT);
+ BMO_remove_tagged_faces(bm, oflag);
+ BMO_remove_tagged_edges(bm, oflag);
+ BMO_remove_tagged_verts(bm, oflag);
}
-static void delete_edges(BMesh *bm)
+static void delete_edges(BMesh *bm, const short oflag)
{
BMEdge *e;
BMFace *f;
@@ -485,14 +485,14 @@
BMIter faces;
for (e = BMIter_New(&edges, bm, BM_EDGES_OF_MESH, bm); e; e = BMIter_Step(&edges)) {
- if (BMO_TestFlag(bm, (BMHeader *)e, DEL_INPUT)) {
+ if (BMO_TestFlag(bm, (BMHeader *)e, oflag)) {
for (f = BMIter_New(&faces, bm, BM_FACES_OF_EDGE, e); f; f = BMIter_Step(&faces)) {
- BMO_SetFlag(bm, (BMHeader *)f, DEL_INPUT);
+ BMO_SetFlag(bm, (BMHeader *)f, oflag);
}
}
}
- BM_remove_tagged_faces(bm, DEL_INPUT);
- BM_remove_tagged_edges(bm, DEL_INPUT);
+ BMO_remove_tagged_faces(bm, oflag);
+ BMO_remove_tagged_edges(bm, oflag);
}
/* you need to make remove tagged verts/edges/faces
@@ -506,7 +506,7 @@
/* Break this into smaller functions */
-static void delete_context(BMesh *bm, int type)
+static void delete_context(BMesh *bm, const short oflag, int type)
{
BMVert *v;
BMEdge *e;
@@ -516,77 +516,77 @@
BMIter edges;
BMIter faces;
- if (type == DEL_VERTS) delete_verts(bm);
+ if (type == DEL_VERTS) delete_verts(bm, oflag);
else if (type == DEL_EDGES) {
/* flush down to vert */
for (e = BMIter_New(&edges, bm, BM_EDGES_OF_MESH, bm); e; e = BMIter_Step(&edges)) {
- if (BMO_TestFlag(bm, (BMHeader *)e, DEL_INPUT)) {
- BMO_SetFlag(bm, (BMHeader *)(e->v1), DEL_INPUT);
- BMO_SetFlag(bm, (BMHeader *)(e->v2), DEL_INPUT);
+ if (BMO_TestFlag(bm, (BMHeader *)e, oflag)) {
+ BMO_SetFlag(bm, (BMHeader *)(e->v1), oflag);
+ BMO_SetFlag(bm, (BMHeader *)(e->v2), oflag);
}
}
- delete_edges(bm);
+ delete_edges(bm, oflag);
/* remove loose vertice */
for (v = BMIter_New(&verts, bm, BM_VERTS_OF_MESH, bm); v; v = BMIter_Step(&verts)) {
- if (BMO_TestFlag(bm, (BMHeader *)v, DEL_INPUT) && (!(v->e)))
+ if (BMO_TestFlag(bm, (BMHeader *)v, oflag) && (!(v->e)))
BMO_SetFlag(bm, (BMHeader *)v, DEL_WIREVERT);
}
- BM_remove_tagged_verts(bm, DEL_WIREVERT);
+ BMO_remove_tagged_verts(bm, DEL_WIREVERT);
}
- else if (type == DEL_EDGESFACES) delete_edges(bm);
- else if (type == DEL_ONLYFACES) BM_remove_tagged_faces(bm, DEL_INPUT);
+ else if (type == DEL_EDGESFACES) delete_edges(bm, oflag);
+ else if (type == DEL_ONLYFACES) BMO_remove_tagged_faces(bm, oflag);
else if (type == DEL_ONLYTAGGED) {
- BM_remove_tagged_faces(bm, DEL_INPUT);
- BM_remove_tagged_edges(bm, DEL_INPUT);
- BM_remove_tagged_verts(bm, DEL_INPUT);
+ BMO_remove_tagged_faces(bm, oflag);
+ BMO_remove_tagged_edges(bm, oflag);
+ BMO_remove_tagged_verts(bm, oflag);
}
else if (type == DEL_FACES) {
/* go through and mark all edges and all verts of all faces for delet */
for (f = BMIter_New(&faces, bm, BM_FACES_OF_MESH, bm); f; f = BMIter_Step(&faces)) {
- if (BMO_TestFlag(bm, (BMHeader *)f, DEL_INPUT)) {
+ if (BMO_TestFlag(bm, (BMHeader *)f, oflag)) {
for (e = BMIter_New(&edges, bm, BM_EDGES_OF_FACE, f); e; e = BMIter_Step(&edges))
- BMO_SetFlag(bm, (BMHeader *)e, DEL_INPUT);
+ BMO_SetFlag(bm, (BMHeader *)e, oflag);
for (v = BMIter_New(&verts, bm, BM_VERTS_OF_FACE, f); v; v = BMIter_Step(&verts))
- BMO_SetFlag(bm, (BMHeader *)v, DEL_INPUT);
+ BMO_SetFlag(bm, (BMHeader *)v, oflag);
}
}
/* now go through and mark all remaining faces all edges for keeping */
for (f = BMIter_New(&faces, bm, BM_FACES_OF_MESH, bm); f; f = BMIter_Step(&faces)) {
- if (!BMO_TestFlag(bm, (BMHeader *)f, DEL_INPUT)) {
+ if (!BMO_TestFlag(bm, (BMHeader *)f, oflag)) {
for (e = BMIter_New(&edges, bm, BM_EDGES_OF_FACE, f); e; e = BMIter_Step(&edges)) {
- BMO_ClearFlag(bm, (BMHeader *)e, DEL_INPUT);
+ BMO_ClearFlag(bm, (BMHeader *)e, oflag);
}
for (v = BMIter_New(&verts, bm, BM_VERTS_OF_FACE, f); v; v = BMIter_Step(&verts)) {
- BMO_ClearFlag(bm, (BMHeader *)v, DEL_INPUT);
+ BMO_ClearFlag(bm, (BMHeader *)v, oflag);
}
}
}
/* also mark all the vertices of remaining edges for keeping */
for (e = BMIter_New(&edges, bm, BM_EDGES_OF_MESH, bm); e; e = BMIter_Step(&edges)) {
- if (!BMO_TestFlag(bm, (BMHeader *)e, DEL_INPUT)) {
- BMO_ClearFlag(bm, (BMHeader *)e->v1, DEL_INPUT);
- BMO_ClearFlag(bm, (BMHeader *)e->v2, DEL_INPUT);
+ if (!BMO_TestFlag(bm, (BMHeader *)e, oflag)) {
+ BMO_ClearFlag(bm, (BMHeader *)e->v1, oflag);
+ BMO_ClearFlag(bm, (BMHeader *)e->v2, oflag);
}
}
/* now delete marked face */
- BM_remove_tagged_faces(bm, DEL_INPUT);
+ BMO_remove_tagged_faces(bm, oflag);
/* delete marked edge */
- BM_remove_tagged_edges(bm, DEL_INPUT);
+ BMO_remove_tagged_edges(bm, oflag);
/* remove loose vertice */
- BM_remove_tagged_verts(bm, DEL_INPUT);
+ BMO_remove_tagged_verts(bm, oflag);
}
/* does this option even belong in here */
else if (type == DEL_ALL) {
for (f = BMIter_New(&faces, bm, BM_FACES_OF_MESH, bm); f; f = BMIter_Step(&faces))
- BMO_SetFlag(bm, (BMHeader *)f, DEL_INPUT);
+ BMO_SetFlag(bm, (BMHeader *)f, oflag);
for (e = BMIter_New(&edges, bm, BM_EDGES_OF_MESH, bm); e; e = BMIter_Step(&edges))
- BMO_SetFlag(bm, (BMHeader *)e, DEL_INPUT);
+ BMO_SetFlag(bm, (BMHeader *)e, oflag);
for (v = BMIter_New(&verts, bm, BM_VERTS_OF_MESH, bm); v; v = BMIter_Step(&verts))
- BMO_SetFlag(bm, (BMHeader *)v, DEL_INPUT);
+ BMO_SetFlag(bm, (BMHeader *)v, oflag);
- BM_remove_tagged_faces(bm, DEL_INPUT);
- BM_remove_tagged_edges(bm, DEL_INPUT);
- BM_remove_tagged_verts(bm, DEL_INPUT);
+ BMO_remove_tagged_faces(bm, oflag);
+ BMO_remove_tagged_edges(bm, oflag);
+ BMO_remove_tagged_verts(bm, oflag);
}
}
More information about the Bf-blender-cvs
mailing list