[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [43953] branches/bmesh/blender/source/ blender/bmesh: Code Cleanup:
Campbell Barton
ideasman42 at gmail.com
Tue Feb 7 15:01:36 CET 2012
Revision: 43953
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=43953
Author: campbellbarton
Date: 2012-02-07 14:01:34 +0000 (Tue, 07 Feb 2012)
Log Message:
-----------
Code Cleanup:
BMesh operator flag was being passed around as in int, but the value is infact a short. use short for all functions now.
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/intern/bmesh_operators.c
branches/bmesh/blender/source/blender/bmesh/intern/bmesh_polygon.c
branches/bmesh/blender/source/blender/bmesh/intern/bmesh_private.h
Modified: branches/bmesh/blender/source/blender/bmesh/bmesh_operator_api.h
===================================================================
--- branches/bmesh/blender/source/blender/bmesh/bmesh_operator_api.h 2012-02-07 13:54:16 UTC (rev 43952)
+++ branches/bmesh/blender/source/blender/bmesh/bmesh_operator_api.h 2012-02-07 14:01:34 UTC (rev 43953)
@@ -181,13 +181,13 @@
#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 oflag);
-void BMO_ClearFlag(struct BMesh *bm, void *element, int oflag);
-int BMO_TestFlag(struct BMesh *bm, void *element, int oflag);*/
+void BMO_SetFlag(struct BMesh *bm, void *element, const short oflag);
+void BMO_ClearFlag(struct BMesh *bm, void *element, const short oflag);
+int BMO_TestFlag(struct BMesh *bm, void *element, const short 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, const int oflag, const char htype);
+int BMO_CountFlag(struct BMesh *bm, const short oflag, const char htype);
/*---------formatted operator initialization/execution-----------*/
/*
@@ -251,13 +251,13 @@
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, 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);
+/* 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_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_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);
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_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, const int oflag);
+void BMO_Clear_Flag_All(BMesh *bm, BMOperator *op, const char htype, const short 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 oflag, const char htype);
+ const short 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 oflag, const char htype);
+ const short 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 oflag, const char htype);
+ const short 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 @@
/* Counts the number of edges with tool flag toolflag around
*/
-int BMO_Vert_CountEdgeFlags(BMesh *bm, BMVert *v, const int oflag);
+int BMO_Vert_CountEdgeFlags(BMesh *bm, BMVert *v, const short 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 @@
/* 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, const int oflag);
+ const char *slotname, const short oflag);
/* pointer versoins of BMO_Get_MapFloat and BMO_Insert_MapFloat.
*
Modified: branches/bmesh/blender/source/blender/bmesh/intern/bmesh_construct.c
===================================================================
--- branches/bmesh/blender/source/blender/bmesh/intern/bmesh_construct.c 2012-02-07 13:54:16 UTC (rev 43952)
+++ branches/bmesh/blender/source/blender/bmesh/intern/bmesh_construct.c 2012-02-07 14:01:34 UTC (rev 43953)
@@ -368,7 +368,7 @@
*
*/
-void BM_remove_tagged_faces(BMesh *bm, const int oflag)
+void BM_remove_tagged_faces(BMesh *bm, const short oflag)
{
BMFace *f;
BMIter iter;
@@ -380,7 +380,7 @@
}
}
-void BM_remove_tagged_edges(BMesh *bm, const int oflag)
+void BM_remove_tagged_edges(BMesh *bm, const short oflag)
{
BMEdge *e;
BMIter iter;
@@ -392,7 +392,7 @@
}
}
-void BM_remove_tagged_verts(BMesh *bm, const int oflag)
+void BM_remove_tagged_verts(BMesh *bm, const short oflag)
{
BMVert *v;
BMIter iter;
Modified: branches/bmesh/blender/source/blender/bmesh/intern/bmesh_operators.c
===================================================================
--- branches/bmesh/blender/source/blender/bmesh/intern/bmesh_operators.c 2012-02-07 13:54:16 UTC (rev 43952)
+++ branches/bmesh/blender/source/blender/bmesh/intern/bmesh_operators.c 2012-02-07 14:01:34 UTC (rev 43953)
@@ -81,14 +81,14 @@
/* Dummy slot so there is something to return when slot name lookup fails */
static BMOpSlot BMOpEmptySlot = {0};
-void BMO_Set_OpFlag(BMesh *UNUSED(bm), BMOperator *op, const int flag)
+void BMO_Set_OpFlag(BMesh *UNUSED(bm), BMOperator *op, const int op_flag)
{
- op->flag |= flag;
+ op->flag |= op_flag;
}
-void BMO_Clear_OpFlag(BMesh *UNUSED(bm), BMOperator *op, const int flag)
+void BMO_Clear_OpFlag(BMesh *UNUSED(bm), BMOperator *op, const int op_flag)
{
- op->flag &= ~flag;
+ op->flag &= ~op_flag;
}
/*
@@ -433,7 +433,7 @@
*
*/
-int BMO_CountFlag(BMesh *bm, const int oflag, const char htype)
+int BMO_CountFlag(BMesh *bm, const short oflag, const char htype)
{
BMIter elements;
BMHeader *e;
@@ -461,7 +461,7 @@
return count;
}
-void BMO_Clear_Flag_All(BMesh *bm, BMOperator *UNUSED(op), const char htype, const int oflag)
+void BMO_Clear_Flag_All(BMesh *bm, BMOperator *UNUSED(op), const char htype, const short oflag)
{
const char iter_types[3] = {BM_VERTS_OF_MESH,
BM_EDGES_OF_MESH,
@@ -540,7 +540,7 @@
#endif
void BMO_Mapping_To_Flag(struct BMesh *bm, struct BMOperator *op,
- const char *slotname, const int oflag)
+ const char *slotname, const short oflag)
{
GHashIterator it;
BMOpSlot *slot = BMO_GetSlot(op, slotname);
@@ -673,7 +673,7 @@
* into an output slot for an operator.
*/
void BMO_Flag_To_Slot(BMesh *bm, BMOperator *op, const char *slotname,
- const int oflag, const char htype)
+ const short oflag, const char htype)
{
BMIter elements;
BMHeader *e;
@@ -765,7 +765,7 @@
BM_ClearHFlag(data[i], hflag);
}
}
-int BMO_Vert_CountEdgeFlags(BMesh *bm, BMVert *v, const int oflag)
+int BMO_Vert_CountEdgeFlags(BMesh *bm, BMVert *v, const short oflag)
{
int count = 0;
@@ -791,7 +791,7 @@
* Flags elements in a slots buffer
*/
void BMO_Flag_Buffer(BMesh *bm, BMOperator *op, const char *slotname,
- const int oflag, const char htype)
+ const short oflag, const char htype)
{
BMOpSlot *slot = BMO_GetSlot(op, slotname);
BMHeader **data = slot->data.p;
@@ -812,7 +812,7 @@
* Removes flags from elements in a slots buffer
*/
void BMO_Unflag_Buffer(BMesh *bm, BMOperator *op, const char *slotname,
- const int oflag, const char htype)
+ const short oflag, const char htype)
{
BMOpSlot *slot = BMO_GetSlot(op, slotname);
BMHeader **data = slot->data.p;
@@ -1407,7 +1407,7 @@
#ifdef BMO_ToggleFlag
#undef BMO_ToggleFlag
#endif
-static void BMO_ToggleFlag(BMesh *bm, void *element, int oflag)
+static void BMO_ToggleFlag(BMesh *bm, void *element, const short oflag)
{
BMHeader *head = element;
head->flags[bm->stackdepth - 1].f ^= oflag;
@@ -1421,7 +1421,7 @@
#ifdef BMO_SetFlag
#undef BMO_SetFlag
#endif
-static void BMO_SetFlag(BMesh *bm, void *element, const int oflag)
+static void BMO_SetFlag(BMesh *bm, void *element, const short oflag)
{
BMHeader *head = element;
head->flags[bm->stackdepth - 1].f |= oflag;
@@ -1435,7 +1435,7 @@
#ifdef BMO_ClearFlag
#undef BMO_ClearFlag
#endif
-static void BMO_ClearFlag(BMesh *bm, void *element, const int oflag)
+static void BMO_ClearFlag(BMesh *bm, void *element, const short oflag)
{
BMHeader *head = element;
head->flags[bm->stackdepth - 1].f &= ~oflag;
@@ -1450,7 +1450,7 @@
#ifdef BMO_TestFlag
#undef BMO_TestFlag
#endif
-static int BMO_TestFlag(BMesh *bm, void *element, const int oflag)
+static int BMO_TestFlag(BMesh *bm, void *element, const short oflag)
{
BMHeader *head = element;
if (head->flags[bm->stackdepth - 1].f & oflag)
Modified: branches/bmesh/blender/source/blender/bmesh/intern/bmesh_polygon.c
===================================================================
--- branches/bmesh/blender/source/blender/bmesh/intern/bmesh_polygon.c 2012-02-07 13:54:16 UTC (rev 43952)
+++ branches/bmesh/blender/source/blender/bmesh/intern/bmesh_polygon.c 2012-02-07 14:01:34 UTC (rev 43953)
@@ -851,7 +851,7 @@
* triangles, and will be NULL-terminated.
*/
void BM_Triangulate_Face(BMesh *bm, BMFace *f, float (*projectverts)[3],
- const int newedge_oflag, const int newface_oflag, BMFace **newfaces)
+ const short newedge_oflag, const short newface_oflag, BMFace **newfaces)
{
int i, done, nvert, nf_i = 0;
BMLoop *newl, *nextloop;
Modified: branches/bmesh/blender/source/blender/bmesh/intern/bmesh_private.h
===================================================================
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list