Revision: 44048
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=44048
Author: campbellbarton
Date: 2012-02-12 06:24:12 +0000 (Sun, 12 Feb 2012)
Log Message:
-----------
rename BM_ flags for `BMHeader->hflag` to BM_ELEM_ to be more clear that these
flags apply to bmesh elements.
Modified Paths:
--------------
branches/bmesh/blender/source/blender/blenkernel/intern/bvhutils.c
branches/bmesh/blender/source/blender/blenkernel/intern/editderivedmesh.c
branches/bmesh/blender/source/blender/bmesh/bmesh.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_eulers.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/operators/extrudeops.c
branches/bmesh/blender/source/blender/bmesh/operators/join_triangles.c
branches/bmesh/blender/source/blender/bmesh/operators/mesh_conv.c
branches/bmesh/blender/source/blender/bmesh/operators/subdivideop.c
branches/bmesh/blender/source/blender/bmesh/operators/utils.c
branches/bmesh/blender/source/blender/bmesh/tools/BME_bevel.c
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/loopcut.c
branches/bmesh/blender/source/blender/editors/mesh/mesh_data.c
branches/bmesh/blender/source/blender/editors/mesh/mesh_navmesh.c
branches/bmesh/blender/source/blender/editors/object/object_hook.c
branches/bmesh/blender/source/blender/editors/object/object_relations.c
branches/bmesh/blender/source/blender/editors/object/object_vgroup.c
branches/bmesh/blender/source/blender/editors/render/render_shading.c
branches/bmesh/blender/source/blender/editors/space_view3d/drawmesh.c
branches/bmesh/blender/source/blender/editors/space_view3d/drawobject.c
branches/bmesh/blender/source/blender/editors/space_view3d/view3d_buttons.c
branches/bmesh/blender/source/blender/editors/space_view3d/view3d_select.c
branches/bmesh/blender/source/blender/editors/space_view3d/view3d_snap.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/transform/transform_manipulator.c
branches/bmesh/blender/source/blender/editors/transform/transform_orientations.c
branches/bmesh/blender/source/blender/editors/transform/transform_snap.c
branches/bmesh/blender/source/blender/editors/util/crazyspace.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/editors/uvedit/uvedit_unwrap_ops.c
branches/bmesh/blender/source/blender/modifiers/intern/MOD_edgesplit.c
Modified: branches/bmesh/blender/source/blender/blenkernel/intern/bvhutils.c
===================================================================
--- branches/bmesh/blender/source/blender/blenkernel/intern/bvhutils.c
2012-02-12 06:09:22 UTC (rev 44047)
+++ branches/bmesh/blender/source/blender/blenkernel/intern/bvhutils.c
2012-02-12 06:24:12 UTC (rev 44048)
@@ -619,14 +619,14 @@
/*Start with the assumption the
triangle should be included for snapping.*/
insert = 1;
- if (BM_TestHFlag(f, BM_SELECT)
|| BM_TestHFlag(f, BM_HIDDEN)) {
+ if (BM_TestHFlag(f,
BM_ELEM_SELECT) || BM_TestHFlag(f, BM_ELEM_HIDDEN)) {
/*Don't insert
triangles tesselated from faces that are hidden
or selected*/
insert = 0;
}
else {
BM_ITER(v, &iter,
em->bm, BM_VERTS_OF_FACE, f) {
- if
(BM_TestHFlag(v, BM_SELECT)) {
+ if
(BM_TestHFlag(v, BM_ELEM_SELECT)) {
/*Don't
insert triangles tesselated from faces that have
any
selected verts.*/
insert
= 0;
Modified:
branches/bmesh/blender/source/blender/blenkernel/intern/editderivedmesh.c
===================================================================
--- branches/bmesh/blender/source/blender/blenkernel/intern/editderivedmesh.c
2012-02-12 06:09:22 UTC (rev 44047)
+++ branches/bmesh/blender/source/blender/blenkernel/intern/editderivedmesh.c
2012-02-12 06:24:12 UTC (rev 44048)
@@ -553,7 +553,7 @@
BMLoop *l;
MLoopUV *lastluv = NULL, *firstluv = NULL;
- if (BM_TestHFlag(efa, BM_HIDDEN))
+ if (BM_TestHFlag(efa, BM_ELEM_HIDDEN))
continue;
BM_ITER(l, &liter, em->bm, BM_LOOPS_OF_FACE, efa) {
@@ -672,7 +672,7 @@
int drawSmooth;
efa = l[0]->f;
- drawSmooth= BM_TestHFlag(efa, BM_SMOOTH);
+ drawSmooth= BM_TestHFlag(efa, BM_ELEM_SMOOTH);
draw = setDrawOptions==NULL ? 1 :
setDrawOptions(userData, BM_GetIndex(efa), &drawSmooth);
if (draw) {
@@ -744,7 +744,7 @@
int drawSmooth;
efa = l[0]->f;
- drawSmooth= BM_TestHFlag(efa, BM_SMOOTH);
+ drawSmooth= BM_TestHFlag(efa, BM_ELEM_SMOOTH);
draw = setDrawOptions==NULL ? 1 :
setDrawOptions(userData, BM_GetIndex(efa), &drawSmooth);
if (draw) {
@@ -871,7 +871,7 @@
MTexPoly *tp= CustomData_bmesh_get(&bm->pdata,
ls[0]->f->head.data, CD_MTEXPOLY);
MTFace mtf = {{{0}}};
/*unsigned char *cp= NULL;*/ /*UNUSED*/
- int drawSmooth= BM_TestHFlag(ls[0]->f, BM_SMOOTH);
+ int drawSmooth= BM_TestHFlag(ls[0]->f, BM_ELEM_SMOOTH);
int flag;
efa = ls[0]->f;
@@ -941,7 +941,7 @@
MTexPoly *tp= CustomData_bmesh_get(&bm->pdata,
ls[0]->f->head.data, CD_MTEXPOLY);
MTFace mtf = {{{0}}};
/*unsigned char *cp= NULL;*/ /*UNUSED*/
- int drawSmooth= BM_TestHFlag(ls[0]->f, BM_SMOOTH);
+ int drawSmooth= BM_TestHFlag(ls[0]->f, BM_ELEM_SMOOTH);
int flag;
efa = ls[0]->f;
@@ -1095,7 +1095,7 @@
int drawSmooth;
efa = ltri[0]->f;
- drawSmooth= BM_TestHFlag(efa, BM_SMOOTH);
+ drawSmooth= BM_TestHFlag(efa, BM_ELEM_SMOOTH);
if (setDrawOptions && !setDrawOptions(userData,
BM_GetIndex(efa)))
continue;
@@ -1217,7 +1217,7 @@
int drawSmooth;
efa = ltri[0]->f;
- drawSmooth = BM_TestHFlag(efa, BM_SMOOTH);
+ drawSmooth = BM_TestHFlag(efa, BM_ELEM_SMOOTH);
/* face hiding */
if (setFace && !setFace(userData, BM_GetIndex(efa)))
Modified: branches/bmesh/blender/source/blender/bmesh/bmesh.h
===================================================================
--- branches/bmesh/blender/source/blender/bmesh/bmesh.h 2012-02-12 06:09:22 UTC
(rev 44047)
+++ branches/bmesh/blender/source/blender/bmesh/bmesh.h 2012-02-12 06:24:12 UTC
(rev 44048)
@@ -83,25 +83,24 @@
*
*/
-/*BMHeader->htype (char) */
+/* BMHeader->htype (char) */
#define BM_VERT 1
#define BM_EDGE 2
#define BM_LOOP 4
#define BM_FACE 8
#define BM_ALL (BM_VERT | BM_EDGE | BM_LOOP | BM_FACE)
-/*BMHeader->hflag (char, all bits used!) */
-#define BM_SELECT (1<<0)
+/* BMHeader->hflag (char, all bits used!) */
+#define BM_ELEM_SELECT (1<<0)
+#define BM_ELEM_HIDDEN (1<<1)
+#define BM_ELEM_SEAM (1<<2)
+#define BM_ELEM_SHARP (1<<3)
+#define BM_ELEM_SMOOTH (1<<4)
+#define BM_ELEM_TAG (1<<5) /* internal flag, used for ensuring correct
normals
+ * during multires interpolation, and any other
time
+ * when temp tagging is handy.
+ * always assume dirty & clear before use. */
-#define BM_SEAM (1<<1)
-#define BM_HIDDEN (1<<2)
-#define BM_SHARP (1<<3)
-#define BM_SMOOTH (1<<4)
-#define BM_TMP_TAG (1<<5) /* internal flag, used for ensuring correct
normals
- * during multires interpolation, and any other time
- * when temp tagging is handy.
- * always assume dirty & clear before use. */
-
/* we have 2 spare flags which is awesome but since we're limited to 8
* only add new flags with care! - campbell */
/* #define BM_TMP_SPARE (1<<6) */
Modified: branches/bmesh/blender/source/blender/bmesh/bmesh_operator_api.h
===================================================================
--- branches/bmesh/blender/source/blender/bmesh/bmesh_operator_api.h
2012-02-12 06:09:22 UTC (rev 44047)
+++ branches/bmesh/blender/source/blender/bmesh/bmesh_operator_api.h
2012-02-12 06:24:12 UTC (rev 44048)
@@ -194,7 +194,7 @@
* this system is used to execute or initialize an operator,
* using a formatted-string system.
*
- * for example, BMO_CallOpf(bm, "del geom=%hf context=%d", BM_SELECT,
DEL_FACES);
+ * for example, BMO_CallOpf(bm, "del geom=%hf context=%d", BM_ELEM_SELECT,
DEL_FACES);
* . . .will execute the delete operator, feeding in selected faces, deleting
them.
*
* the basic format for the format string is:
@@ -319,7 +319,7 @@
/* 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_HIDDEN set).*/
+ * header flag BM_ELEM_HIDDEN set).*/
void BMO_HeaderFlag_To_Slot(struct BMesh *bm, struct BMOperator *op, const
char *slotname,
const char hflag, const char htype);
Modified: branches/bmesh/blender/source/blender/bmesh/intern/bmesh_construct.c
===================================================================
--- branches/bmesh/blender/source/blender/bmesh/intern/bmesh_construct.c
2012-02-12 06:09:22 UTC (rev 44047)
+++ branches/bmesh/blender/source/blender/bmesh/intern/bmesh_construct.c
2012-02-12 06:24:12 UTC (rev 44048)
@@ -789,23 +789,23 @@
/* ME -> BM */
char BM_Vert_Flag_From_MEFlag(const char meflag)
{
- return ( ((meflag & SELECT) ? BM_SELECT : 0) |
- ((meflag & ME_HIDE) ? BM_HIDDEN : 0)
+ return ( ((meflag & SELECT) ? BM_ELEM_SELECT : 0) |
+ ((meflag & ME_HIDE) ? BM_ELEM_HIDDEN : 0)
);
}
char BM_Edge_Flag_From_MEFlag(const short meflag)
{
- return ( ((meflag & SELECT) ? BM_SELECT : 0) |
- ((meflag & ME_SEAM) ? BM_SEAM : 0) |
- ((meflag & ME_SHARP) ? BM_SHARP : 0) |
- ((meflag & ME_HIDE) ? BM_HIDDEN : 0)
+ return ( ((meflag & SELECT) ? BM_ELEM_SELECT : 0) |
+ ((meflag & ME_SEAM) ? BM_ELEM_SEAM : 0) |
+ ((meflag & ME_SHARP) ? BM_ELEM_SHARP : 0) |
+ ((meflag & ME_HIDE) ? BM_ELEM_HIDDEN : 0)
);
}
char BM_Face_Flag_From_MEFlag(const char meflag)
{
- return ( ((meflag & ME_FACE_SEL) ? BM_SELECT : 0) |
- ((meflag & ME_SMOOTH) ? BM_SMOOTH : 0) |
- ((meflag & ME_HIDE) ? BM_HIDDEN : 0)
+ return ( ((meflag & ME_FACE_SEL) ? BM_ELEM_SELECT : 0) |
+ ((meflag & ME_SMOOTH) ? BM_ELEM_SMOOTH : 0) |
+ ((meflag & ME_HIDE) ? BM_ELEM_HIDDEN : 0)
);
}
@@ -814,18 +814,18 @@
{
const char hflag = eve->head.hflag;
- return ( ((hflag & BM_SELECT) ? SELECT : 0) |
- ((hflag & BM_HIDDEN) ? ME_HIDE : 0)
+ return ( ((hflag & BM_ELEM_SELECT) ? SELECT : 0) |
+ ((hflag & BM_ELEM_HIDDEN) ? ME_HIDE : 0)
);
}
short BM_Edge_Flag_To_MEFlag(BMEdge *eed)
{
const char hflag = eed->head.hflag;
- return ( ((hflag & BM_SELECT) ? SELECT : 0) |
- ((hflag & BM_SEAM) ? ME_SEAM : 0) |
- ((hflag & BM_SHARP) ? ME_SHARP : 0) |
- ((hflag & BM_HIDDEN) ? ME_HIDE : 0) |
+ return ( ((hflag & BM_ELEM_SELECT) ? SELECT : 0) |
+ ((hflag & BM_ELEM_SEAM) ? ME_SEAM : 0) |
+ ((hflag & BM_ELEM_SHARP) ? ME_SHARP : 0) |
+ ((hflag & BM_ELEM_HIDDEN) ? ME_HIDE : 0) |
((BM_Wire_Edge(NULL, eed)) ? ME_LOOSEEDGE : 0) | /* not
typical */
(ME_EDGEDRAW | ME_EDGERENDER)
);
@@ -834,9 +834,9 @@
{
const char hflag = efa->head.hflag;
- return ( ((hflag & BM_SELECT) ? ME_FACE_SEL : 0) |
- ((hflag & BM_SMOOTH) ? ME_SMOOTH : 0) |
- ((hflag & BM_HIDDEN) ? ME_HIDE : 0)
+ return ( ((hflag & BM_ELEM_SELECT) ? ME_FACE_SEL : 0) |
+ ((hflag & BM_ELEM_SMOOTH) ? ME_SMOOTH : 0) |
+ ((hflag & BM_ELEM_HIDDEN) ? ME_HIDE : 0)
);
}
Modified: branches/bmesh/blender/source/blender/bmesh/intern/bmesh_eulers.c
===================================================================
--- branches/bmesh/blender/source/blender/bmesh/intern/bmesh_eulers.c
2012-02-12 06:09:22 UTC (rev 44047)
+++ branches/bmesh/blender/source/blender/bmesh/intern/bmesh_eulers.c
2012-02-12 06:24:12 UTC (rev 44048)
@@ -362,7 +362,7 @@
int bmesh_kv(BMesh *bm, BMVert *v)
{
if(v->e == NULL) {
- if (BM_TestHFlag(v, BM_SELECT)) bm->totvertsel--;
+ if (BM_TestHFlag(v, BM_ELEM_SELECT)) bm->totvertsel--;
BLI_remlink(&(bm->verts), &(v->head));
bmesh_free_vert(bm,v);
@@ -398,7 +398,7 @@
if(edok) bmesh_error();
/*remove and deallocate*/
- if (BM_TestHFlag(e, BM_SELECT)) bm->totedgesel--;
+ if (BM_TestHFlag(e, BM_ELEM_SELECT)) bm->totedgesel--;
BLI_remlink(&(bm->edges), &(e->head));
bmesh_free_edge(bm, e);
return 1;
@@ -438,7 +438,7 @@
bply->loopbase = newbase;
}
- if (BM_TestHFlag(bply, BM_SELECT)) bm->totfacesel--;
+ if (BM_TestHFlag(bply, BM_ELEM_SELECT)) bm->totfacesel--;
BLI_remlink(&(bm->polys), &(bply->head));
bmesh_free_poly(bm, bply);
return 1;
Modified: branches/bmesh/blender/source/blender/bmesh/intern/bmesh_marking.c
@@ Diff output truncated at 10240 characters. @@
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
