Code Cleanup:

[blender.git] / source / blender / bmesh / bmesh_operator_api.h

diff --git a/source/blender/bmesh/bmesh_operator_api.h b/source/blender/bmesh/bmesh_operator_api.h
index 153731d0040048c0cc9dd94fe481db29881ea1de..9bd73873606f48c14fe966fc481af9dd8d71eefd 100644 (file)
--- a/source/blender/bmesh/bmesh_operator_api.h
+++ b/source/blender/bmesh/bmesh_operator_api.h
@@ -175,19 +175,19 @@ void BMO_Finish_Op(struct BMesh *bm, struct BMOperator *op);
  * ghash or a mapping slot to do it. */
 
 /* flags 15 and 16 (1<<14 and 1<<15) are reserved for bmesh api use */
-#define BMO_TestFlag(bm, element, flag) (((BMHeader*)(element))->flags[bm->stackdepth-1].f & (flag))
-#define BMO_SetFlag(bm, element, flag) (((BMHeader*)(element))->flags[bm->stackdepth-1].f |= (flag))
-#define BMO_ClearFlag(bm, element, flag) (((BMHeader*)(element))->flags[bm->stackdepth-1].f &= ~(flag))
-#define BMO_ToggleFlag(bm, element, flag) (((BMHeader*)(element))->flags[bm->stackdepth-1].f ^= (flag))
+#define BMO_TestFlag(bm, element, oflag) (((BMHeader*)(element))->flags[bm->stackdepth-1].f & (oflag))
+#define BMO_SetFlag(bm, element, oflag) (((BMHeader*)(element))->flags[bm->stackdepth-1].f |= (oflag))
+#define BMO_ClearFlag(bm, element, oflag) (((BMHeader*)(element))->flags[bm->stackdepth-1].f &= ~(oflag))
+#define BMO_ToggleFlag(bm, element, oflag) (((BMHeader*)(element))->flags[bm->stackdepth-1].f ^= (oflag))
 
 /*profiling showed a significant amount of time spent in BMO_TestFlag
-void BMO_SetFlag(struct BMesh *bm, void *element, int flag);
-void BMO_ClearFlag(struct BMesh *bm, void *element, int flag);
-int BMO_TestFlag(struct BMesh *bm, void *element, int flag);*/
+void BMO_SetFlag(struct BMesh *bm, void *element, int oflag);
+void BMO_ClearFlag(struct BMesh *bm, void *element, int oflag);
+int BMO_TestFlag(struct BMesh *bm, void *element, int oflag);*/
 
 /* count the number of elements with a specific flag.
  * type can be a bitmask of BM_FACE, BM_EDGE, or BM_FACE. */
-int BMO_CountFlag(struct BMesh *bm, int flag, const char htype);
+int BMO_CountFlag(struct BMesh *bm, const int oflag, const char htype);
 
 /*---------formatted operator initialization/execution-----------*/
 /*
@@ -252,12 +252,12 @@ void BMO_CopySlot(struct BMOperator *source_op, struct BMOperator *dest_op,
                   const char *src, const char *dst);
 
 /*remove tool flagged elements*/
-void BM_remove_tagged_faces(struct BMesh *bm, int flag);
-void BM_remove_tagged_edges(struct BMesh *bm, int flag);
-void BM_remove_tagged_verts(struct BMesh *bm, int flag);
+void BM_remove_tagged_faces(struct BMesh *bm, const int oflag);
+void BM_remove_tagged_edges(struct BMesh *bm, const int oflag);
+void BM_remove_tagged_verts(struct BMesh *bm, const int oflag);
 
-void BMO_Set_OpFlag(struct BMesh *bm, struct BMOperator *op, int flag);
-void BMO_Clear_OpFlag(struct BMesh *bm, struct BMOperator *op, int flag);
+void BMO_Set_OpFlag(struct BMesh *bm, struct BMOperator *op, const int oflag);
+void BMO_Clear_OpFlag(struct BMesh *bm, struct BMOperator *op, const int oflag);
 
 void BMO_Set_Float(struct BMOperator *op, const char *slotname, float f);
 float BMO_Get_Float(BMOperator *op, const char *slotname);
@@ -282,19 +282,19 @@ void BMO_Set_Mat(struct BMOperator *op, const char *slotname, float *mat, int si
 void BMO_Get_Mat4(struct BMOperator *op, const char *slotname, float mat[4][4]);
 void BMO_Get_Mat3(struct BMOperator *op, const char *slotname, float mat[3][3]);
 
-void BMO_Clear_Flag_All(BMesh *bm, BMOperator *op, const char htype, int flag);
+void BMO_Clear_Flag_All(BMesh *bm, BMOperator *op, const char htype, const int oflag);
 
 /* puts every element of type type (which is a bitmask) with tool flag flag,
  * into a slot. */
 void BMO_Flag_To_Slot(struct BMesh *bm, struct BMOperator *op, const char *slotname,
-                      const int flag, const char htype);
+                      const int oflag, const char htype);
 
 /* tool-flags all elements inside an element slot array with flag flag. */
 void BMO_Flag_Buffer(struct BMesh *bm, struct BMOperator *op, const char *slotname,
-                     const int hflag, const char htype);
+                     const int oflag, const char htype);
 /* clears tool-flag flag from all elements inside a slot array. */
 void BMO_Unflag_Buffer(struct BMesh *bm, struct BMOperator *op, const char *slotname,
-                       const int flag, const char htype);
+                       const int oflag, const char htype);
 
 /* tool-flags all elements inside an element slot array with flag flag. */
 void BMO_HeaderFlag_Buffer(struct BMesh *bm, struct BMOperator *op, const char *slotname,
@@ -315,7 +315,7 @@ int BMO_CountSlotMap(struct BMesh *bm, struct BMOperator *op, const char *slotna
 
 /* Counts the number of edges with tool flag toolflag around
  */
-int BMO_Vert_CountEdgeFlags(BMesh *bm, BMVert *v, int toolflag);
+int BMO_Vert_CountEdgeFlags(BMesh *bm, BMVert *v, const int oflag);
 
 /* inserts a key/value mapping into a mapping slot.  note that it copies the
  * value, it doesn't store a reference to it. */
@@ -339,7 +339,7 @@ int BMO_Vert_CountEdgeFlags(BMesh *bm, BMVert *v, int toolflag);
 /* flags all elements in a mapping.  note that the mapping must only have
  * bmesh elements in it.*/
 void BMO_Mapping_To_Flag(struct BMesh *bm, struct BMOperator *op,
-                         const char *slotname, int flag);
+                         const char *slotname, const int oflag);
 
 /* pointer versoins of BMO_Get_MapFloat and BMO_Insert_MapFloat.
  *