[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [44067] branches/bmesh/blender: BMesh api function naming.
Campbell Barton
ideasman42 at gmail.com
Sun Feb 12 19:44:00 CET 2012
Revision: 44067
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=44067
Author: campbellbarton
Date: 2012-02-12 18:43:59 +0000 (Sun, 12 Feb 2012)
Log Message:
-----------
BMesh api function naming.
`_set` suffix was used in two ways (confusing)
* to set a flag to be enabled.
* to set a value passed as an argument.
now use enable/disable rather then set/clear for functions which change flags.
also remove BME_weld.c, the file didnt contain much code and the current extrude works well
Modified Paths:
--------------
branches/bmesh/blender/build_files/cmake/cmake_consistency_check_config.py
branches/bmesh/blender/source/blender/bmesh/bmesh.h
branches/bmesh/blender/source/blender/bmesh/bmesh_marking.h
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_inline.c
branches/bmesh/blender/source/blender/bmesh/intern/bmesh_marking.c
branches/bmesh/blender/source/blender/bmesh/intern/bmesh_mesh.c
branches/bmesh/blender/source/blender/bmesh/intern/bmesh_newcore.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_queries.c
branches/bmesh/blender/source/blender/bmesh/operators/bmo_bevel.c
branches/bmesh/blender/source/blender/bmesh/operators/bmo_connect.c
branches/bmesh/blender/source/blender/bmesh/operators/bmo_create.c
branches/bmesh/blender/source/blender/bmesh/operators/bmo_dissolve.c
branches/bmesh/blender/source/blender/bmesh/operators/bmo_dupe.c
branches/bmesh/blender/source/blender/bmesh/operators/bmo_edgesplit.c
branches/bmesh/blender/source/blender/bmesh/operators/bmo_extrude.c
branches/bmesh/blender/source/blender/bmesh/operators/bmo_join_triangles.c
branches/bmesh/blender/source/blender/bmesh/operators/bmo_mesh_conv.c
branches/bmesh/blender/source/blender/bmesh/operators/bmo_primitive.c
branches/bmesh/blender/source/blender/bmesh/operators/bmo_removedoubles.c
branches/bmesh/blender/source/blender/bmesh/operators/bmo_subdivide.c
branches/bmesh/blender/source/blender/bmesh/operators/bmo_triangulate.c
branches/bmesh/blender/source/blender/bmesh/operators/bmo_utils.c
branches/bmesh/blender/source/blender/bmesh/tools/BME_bevel.c
branches/bmesh/blender/source/blender/bmesh/tools/BME_dupe_ops.c
branches/bmesh/blender/source/blender/editors/include/ED_mesh.h
branches/bmesh/blender/source/blender/editors/mesh/bmesh_select.c
branches/bmesh/blender/source/blender/editors/mesh/bmesh_tools.c
branches/bmesh/blender/source/blender/editors/mesh/bmeshutils.c
branches/bmesh/blender/source/blender/editors/mesh/knifetool.c
branches/bmesh/blender/source/blender/editors/mesh/loopcut.c
branches/bmesh/blender/source/blender/editors/mesh/mesh_intern.h
branches/bmesh/blender/source/blender/editors/space_view3d/view3d_select.c
branches/bmesh/blender/source/blender/editors/transform/transform.c
branches/bmesh/blender/source/blender/editors/transform/transform_conversions.c
branches/bmesh/blender/source/blender/editors/uvedit/uvedit_draw.c
branches/bmesh/blender/source/blender/editors/uvedit/uvedit_ops.c
branches/bmesh/blender/source/blender/modifiers/intern/MOD_bevel.c
branches/bmesh/blender/source/blender/modifiers/intern/MOD_edgesplit.c
Removed Paths:
-------------
branches/bmesh/blender/source/blender/bmesh/tools/BME_extrude.c
Modified: branches/bmesh/blender/build_files/cmake/cmake_consistency_check_config.py
===================================================================
--- branches/bmesh/blender/build_files/cmake/cmake_consistency_check_config.py 2012-02-12 18:17:30 UTC (rev 44066)
+++ branches/bmesh/blender/build_files/cmake/cmake_consistency_check_config.py 2012-02-12 18:43:59 UTC (rev 44067)
@@ -56,7 +56,6 @@
"source/blender/bmesh/tools/BME_bevel.c",
"source/blender/bmesh/tools/BME_dupe_ops.c",
"source/blender/bmesh/tools/BME_duplicate.c",
- "source/blender/bmesh/tools/BME_extrude.c",
"source/blender/bmesh/tools/BME_weld.c",
)
Modified: branches/bmesh/blender/source/blender/bmesh/bmesh.h
===================================================================
--- branches/bmesh/blender/source/blender/bmesh/bmesh.h 2012-02-12 18:17:30 UTC (rev 44066)
+++ branches/bmesh/blender/source/blender/bmesh/bmesh.h 2012-02-12 18:43:59 UTC (rev 44067)
@@ -145,10 +145,10 @@
BM_INLINE char BM_elem_flag_test(const void *element, const char hflag);
/* stuff for dealing with header flags */
-BM_INLINE void BM_elem_flag_set(void *element, const char hflag);
+BM_INLINE void BM_elem_flag_enable(void *element, const char hflag);
/* stuff for dealing with header flags */
-BM_INLINE void BM_elem_flag_clear(void *element, const char hflag);
+BM_INLINE void BM_elem_flag_disable(void *element, const char hflag);
/* stuff for dealing BM_elem_flag_toggle header flags */
BM_INLINE void BM_elem_flag_toggle(void *element, const char hflag);
Modified: branches/bmesh/blender/source/blender/bmesh/bmesh_marking.h
===================================================================
--- branches/bmesh/blender/source/blender/bmesh/bmesh_marking.h 2012-02-12 18:17:30 UTC (rev 44066)
+++ branches/bmesh/blender/source/blender/bmesh/bmesh_marking.h 2012-02-12 18:43:59 UTC (rev 44067)
@@ -47,13 +47,13 @@
* chuck it.*/
int BM_elem_select_test(BMesh *bm, const void *element);
-void BM_clear_flag_all(BMesh *bm, const char hflag);
+void BM_mesh_flag_disable_all(BMesh *bm, const char hflag);
/* individual element select functions, BM_elem_select_set is a shortcut for these
* that automatically detects which one to use*/
-void BM_vert_select(struct BMesh *bm, struct BMVert *v, int select);
-void BM_edge_select(struct BMesh *bm, struct BMEdge *e, int select);
-void BM_face_select(struct BMesh *bm, struct BMFace *f, int select);
+void BM_vert_select_set(struct BMesh *bm, struct BMVert *v, int select);
+void BM_edge_select_set(struct BMesh *bm, struct BMEdge *e, int select);
+void BM_face_select_set(struct BMesh *bm, struct BMFace *f, int select);
void BM_select_mode_set(struct BMesh *bm, int selectmode);
Modified: branches/bmesh/blender/source/blender/bmesh/bmesh_operator_api.h
===================================================================
--- branches/bmesh/blender/source/blender/bmesh/bmesh_operator_api.h 2012-02-12 18:17:30 UTC (rev 44066)
+++ branches/bmesh/blender/source/blender/bmesh/bmesh_operator_api.h 2012-02-12 18:43:59 UTC (rev 44067)
@@ -180,14 +180,14 @@
/* flags 15 and 16 (1<<14 and 1<<15) are reserved for bmesh api use */
#define BMO_elem_flag_test(bm, element, oflag) (((BMHeader*)(element))->flags[bm->stackdepth-1].f & (oflag))
-#define BMO_elem_flag_set(bm, element, oflag) (((BMHeader*)(element))->flags[bm->stackdepth-1].f |= (oflag))
-#define BMO_elem_flag_clear(bm, element, oflag) (((BMHeader*)(element))->flags[bm->stackdepth-1].f &= ~(oflag))
+#define BMO_elem_flag_enable(bm, element, oflag) (((BMHeader*)(element))->flags[bm->stackdepth-1].f |= (oflag))
+#define BMO_elem_flag_disable(bm, element, oflag) (((BMHeader*)(element))->flags[bm->stackdepth-1].f &= ~(oflag))
#define BMO_elem_flag_toggle(bm, element, oflag) (((BMHeader*)(element))->flags[bm->stackdepth-1].f ^= (oflag))
/* profiling showed a significant amount of time spent in BMO_elem_flag_test */
#if 0
-void BMO_elem_flag_set(struct BMesh *bm, void *element, const short oflag);
-void BMO_elem_flag_clear(struct BMesh *bm, void *element, const short oflag);
+void BMO_elem_flag_enable(struct BMesh *bm, void *element, const short oflag);
+void BMO_elem_flag_disable(struct BMesh *bm, void *element, const short oflag);
int BMO_elem_flag_test(struct BMesh *bm, void *element, const short oflag);
#endif
@@ -276,8 +276,8 @@
DEL_ONLYTAGGED
};
-void BMO_op_flag_set(struct BMesh *bm, struct BMOperator *op, const int op_flag);
-void BMO_op_flag_clear(struct BMesh *bm, struct BMOperator *op, const int op_flag);
+void BMO_op_flag_enable(struct BMesh *bm, struct BMOperator *op, const int op_flag);
+void BMO_op_flag_disable(struct BMesh *bm, struct BMOperator *op, const int op_flag);
void BMO_slot_float_set(struct BMOperator *op, const char *slotname, float f);
float BMO_slot_float_get(BMOperator *op, const char *slotname);
@@ -302,7 +302,7 @@
void BMO_slot_mat4_set(struct BMOperator *op, const char *slotname, float mat[4][4]);
void BMO_slot_mat3_set(struct BMOperator *op, const char *slotname, float mat[3][3]);
-void BMO_mesh_flag_clear_all(BMesh *bm, BMOperator *op, const char htype, const short oflag);
+void BMO_mesh_flag_disable_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. */
@@ -317,11 +317,11 @@
const short oflag, const char htype);
/* tool-flags all elements inside an element slot array with flag flag. */
-void BMO_slot_buffer_hflag(struct BMesh *bm, struct BMOperator *op, const char *slotname,
- const char hflag, const char htype);
+void BMO_slot_buffer_hflag_enable(struct BMesh *bm, struct BMOperator *op, const char *slotname,
+ const char hflag, const char htype);
/* clears tool-flag flag from all elements inside a slot array. */
-void BMO_slot_buffer_hflag_clear(struct BMesh *bm, struct BMOperator *op, const char *slotname,
- const char hflag, const char htype);
+void BMO_slot_buffer_hflag_disable(struct BMesh *bm, struct BMOperator *op, const char *slotname,
+ const char hflag, const char htype);
/* 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
Modified: branches/bmesh/blender/source/blender/bmesh/intern/bmesh_construct.c
===================================================================
--- branches/bmesh/blender/source/blender/bmesh/intern/bmesh_construct.c 2012-02-12 18:17:30 UTC (rev 44066)
+++ branches/bmesh/blender/source/blender/bmesh/intern/bmesh_construct.c 2012-02-12 18:43:59 UTC (rev 44067)
@@ -418,10 +418,10 @@
if (BMO_elem_flag_test(bm, (BMHeader *)v, oflag)) {
/* Visit edge */
for (e = BM_iter_new(&edges, bm, BM_EDGES_OF_VERT, v); e; e = BM_iter_step(&edges))
- BMO_elem_flag_set(bm, (BMHeader *)e, oflag);
+ BMO_elem_flag_enable(bm, (BMHeader *)e, oflag);
/* Visit face */
for (f = BM_iter_new(&faces, bm, BM_FACES_OF_VERT, v); f; f = BM_iter_step(&faces))
- BMO_elem_flag_set(bm, (BMHeader *)f, oflag);
+ BMO_elem_flag_enable(bm, (BMHeader *)f, oflag);
}
}
@@ -441,7 +441,7 @@
for (e = BM_iter_new(&edges, bm, BM_EDGES_OF_MESH, bm); e; e = BM_iter_step(&edges)) {
if (BMO_elem_flag_test(bm, (BMHeader *)e, oflag)) {
for (f = BM_iter_new(&faces, bm, BM_FACES_OF_EDGE, e); f; f = BM_iter_step(&faces)) {
- BMO_elem_flag_set(bm, (BMHeader *)f, oflag);
+ BMO_elem_flag_enable(bm, (BMHeader *)f, oflag);
}
}
}
@@ -475,15 +475,15 @@
/* flush down to vert */
for (e = BM_iter_new(&edges, bm, BM_EDGES_OF_MESH, bm); e; e = BM_iter_step(&edges)) {
if (BMO_elem_flag_test(bm, (BMHeader *)e, oflag)) {
- BMO_elem_flag_set(bm, (BMHeader *)(e->v1), oflag);
- BMO_elem_flag_set(bm, (BMHeader *)(e->v2), oflag);
+ BMO_elem_flag_enable(bm, (BMHeader *)(e->v1), oflag);
+ BMO_elem_flag_enable(bm, (BMHeader *)(e->v2), oflag);
}
}
bmo_remove_tagged_context_edges(bm, oflag);
/* remove loose vertice */
for (v = BM_iter_new(&verts, bm, BM_VERTS_OF_MESH, bm); v; v = BM_iter_step(&verts)) {
if (BMO_elem_flag_test(bm, (BMHeader *)v, oflag) && (!(v->e)))
- BMO_elem_flag_set(bm, (BMHeader *)v, DEL_WIREVERT);
+ BMO_elem_flag_enable(bm, (BMHeader *)v, DEL_WIREVERT);
}
BMO_remove_tagged_verts(bm, DEL_WIREVERT);
@@ -515,27 +515,27 @@
for (f = BM_iter_new(&faces, bm, BM_FACES_OF_MESH, bm); f; f = BM_iter_step(&faces)) {
if (BMO_elem_flag_test(bm, (BMHeader *)f, oflag)) {
for (e = BM_iter_new(&edges, bm, BM_EDGES_OF_FACE, f); e; e = BM_iter_step(&edges))
- BMO_elem_flag_set(bm, (BMHeader *)e, oflag);
+ BMO_elem_flag_enable(bm, (BMHeader *)e, oflag);
for (v = BM_iter_new(&verts, bm, BM_VERTS_OF_FACE, f); v; v = BM_iter_step(&verts))
- BMO_elem_flag_set(bm, (BMHeader *)v, oflag);
+ BMO_elem_flag_enable(bm, (BMHeader *)v, oflag);
}
}
/* now go through and mark all remaining faces all edges for keeping */
for (f = BM_iter_new(&faces, bm, BM_FACES_OF_MESH, bm); f; f = BM_iter_step(&faces)) {
if (!BMO_elem_flag_test(bm, (BMHeader *)f, oflag)) {
for (e = BM_iter_new(&edges, bm, BM_EDGES_OF_FACE, f); e; e = BM_iter_step(&edges)) {
- BMO_elem_flag_clear(bm, (BMHeader *)e, oflag);
+ BMO_elem_flag_disable(bm, (BMHeader *)e, oflag);
}
for (v = BM_iter_new(&verts, bm, BM_VERTS_OF_FACE, f); v; v = BM_iter_step(&verts)) {
- BMO_elem_flag_clear(bm, (BMHeader *)v, oflag);
+ BMO_elem_flag_disable(bm, (BMHeader *)v, oflag);
}
}
}
/* also mark all the vertices of remaining edges for keeping */
for (e = BM_iter_new(&edges, bm, BM_EDGES_OF_MESH, bm); e; e = BM_iter_step(&edges)) {
if (!BMO_elem_flag_test(bm, (BMHeader *)e, oflag)) {
- BMO_elem_flag_clear(bm, (BMHeader *)e->v1, oflag);
- BMO_elem_flag_clear(bm, (BMHeader *)e->v2, oflag);
+ BMO_elem_flag_disable(bm, (BMHeader *)e->v1, oflag);
+ BMO_elem_flag_disable(bm, (BMHeader *)e->v2, oflag);
}
}
/* now delete marked face */
@@ -551,11 +551,11 @@
{
/* does this option even belong in here? */
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list