[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [43936] branches/bmesh/blender/source/ blender: rename defines to upper case.
Campbell Barton
ideasman42 at gmail.com
Mon Feb 6 23:57:37 CET 2012
Revision: 43936
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=43936
Author: campbellbarton
Date: 2012-02-06 22:57:25 +0000 (Mon, 06 Feb 2012)
Log Message:
-----------
rename defines to upper case.
Modified Paths:
--------------
branches/bmesh/blender/source/blender/bmesh/bmesh.h
branches/bmesh/blender/source/blender/bmesh/intern/bmesh_interp.c
branches/bmesh/blender/source/blender/bmesh/intern/bmesh_iterators.c
branches/bmesh/blender/source/blender/bmesh/intern/bmesh_marking.c
branches/bmesh/blender/source/blender/bmesh/intern/bmesh_mods.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/intern/bmesh_structure.c
branches/bmesh/blender/source/blender/bmesh/operators/bevel.c
branches/bmesh/blender/source/blender/bmesh/operators/extrudeops.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/knifetool.c
Modified: branches/bmesh/blender/source/blender/bmesh/bmesh.h
===================================================================
--- branches/bmesh/blender/source/blender/bmesh/bmesh.h 2012-02-06 22:21:41 UTC (rev 43935)
+++ branches/bmesh/blender/source/blender/bmesh/bmesh.h 2012-02-06 22:57:25 UTC (rev 43936)
@@ -364,7 +364,7 @@
void bmesh_end_edit(BMesh *bm, int flag);
-#define bm_firstfaceloop(p) ((BMLoopList*)(p->loops.first))->first
+#define BM_FACE_FIRST_LOOP(p) ((BMLoopList *)((p)->loops.first))->first
/* size to use for static arrays when dealing with NGons,
* alloc after this limit is reached.
Modified: branches/bmesh/blender/source/blender/bmesh/intern/bmesh_interp.c
===================================================================
--- branches/bmesh/blender/source/blender/bmesh/intern/bmesh_interp.c 2012-02-06 22:21:41 UTC (rev 43935)
+++ branches/bmesh/blender/source/blender/bmesh/intern/bmesh_interp.c 2012-02-06 22:57:25 UTC (rev 43936)
@@ -216,7 +216,7 @@
BM_Copy_Attributes(bm, bm, source, target);
i = 0;
- l2 = l_first = bm_firstfaceloop(source);
+ l2 = l_first = BM_FACE_FIRST_LOOP(source);
do {
copy_v3_v3(cos[i], l2->v->co);
blocks[i] = l2->head.data;
@@ -224,7 +224,7 @@
} while ((l2 = l2->next) != l_first);
i = 0;
- l1 = l_first = bm_firstfaceloop(target);
+ l1 = l_first = BM_FACE_FIRST_LOOP(target);
do {
interp_weights_poly_v3(w, cos, source->len, l1->v->co);
CustomData_bmesh_interp(&bm->ldata, blocks, w, NULL, source->len, l1->head.data);
@@ -395,13 +395,13 @@
BMLoop *l2;
/* computer center */
- l2 = bm_firstfaceloop(l->f);
+ l2 = BM_FACE_FIRST_LOOP(l->f);
do {
cent[0] += (double)l2->v->co[0];
cent[1] += (double)l2->v->co[1];
cent[2] += (double)l2->v->co[2];
l2 = l2->next;
- } while (l2 != bm_firstfaceloop(l->f));
+ } while (l2 != BM_FACE_FIRST_LOOP(l->f));
VECMUL(cent, (1.0 / (double)l->f->len));
@@ -561,7 +561,7 @@
/* if no disps data allocate a new grid, the size of the first grid in source. */
if (!mdisps->totdisp) {
- MDisps *md2 = CustomData_bmesh_get(&bm->ldata, bm_firstfaceloop(source)->head.data, CD_MDISPS);
+ MDisps *md2 = CustomData_bmesh_get(&bm->ldata, BM_FACE_FIRST_LOOP(source)->head.data, CD_MDISPS);
mdisps->totdisp = md2->totdisp;
if (mdisps->totdisp) {
@@ -598,7 +598,7 @@
VECMUL(co, x);
VECADD2(co, co1);
- l2 = bm_firstfaceloop(source);
+ l2 = BM_FACE_FIRST_LOOP(source);
do {
double x2, y2;
MDisps *md1, *md2;
@@ -613,7 +613,7 @@
old_mdisps_bilinear(md1->disps[iy * res + ix], md2->disps, res, (float)x2, (float)y2);
}
l2 = l2->next;
- } while (l2 != bm_firstfaceloop(source));
+ } while (l2 != BM_FACE_FIRST_LOOP(source));
}
}
}
@@ -742,7 +742,7 @@
BM_Copy_Attributes(bm, bm, source, target->f);
i = 0;
- l = l_first = bm_firstfaceloop(source);
+ l = l_first = BM_FACE_FIRST_LOOP(source);
do {
copy_v3_v3(cos[i], l->v->co);
add_v3_v3(cent, cos[i]);
@@ -814,7 +814,7 @@
int i;
i = 0;
- l = l_first = bm_firstfaceloop(source);
+ l = l_first = BM_FACE_FIRST_LOOP(source);
do {
copy_v3_v3(cos[i], l->v->co);
add_v3_v3(cent, cos[i]);
Modified: branches/bmesh/blender/source/blender/bmesh/intern/bmesh_iterators.c
===================================================================
--- branches/bmesh/blender/source/blender/bmesh/intern/bmesh_iterators.c 2012-02-06 22:21:41 UTC (rev 43935)
+++ branches/bmesh/blender/source/blender/bmesh/intern/bmesh_iterators.c 2012-02-06 22:57:25 UTC (rev 43936)
@@ -394,7 +394,7 @@
void bmiter__loop_of_face_begin(BMIter *iter)
{
init_iterator(iter);
- iter->firstloop = iter->nextloop = bm_firstfaceloop(iter->pdata);
+ iter->firstloop = iter->nextloop = BM_FACE_FIRST_LOOP(iter->pdata);
}
void *bmiter__loop_of_face_step(BMIter *iter)
Modified: branches/bmesh/blender/source/blender/bmesh/intern/bmesh_marking.c
===================================================================
--- branches/bmesh/blender/source/blender/bmesh/intern/bmesh_marking.c 2012-02-06 22:21:41 UTC (rev 43935)
+++ branches/bmesh/blender/source/blender/bmesh/intern/bmesh_marking.c 2012-02-06 22:57:25 UTC (rev 43936)
@@ -98,12 +98,12 @@
}
for (f = BMIter_New(&faces, bm, BM_FACES_OF_MESH, bm); f; f = BMIter_Step(&faces)) {
totsel = 0;
- l = (BMLoop *) bm_firstfaceloop(f);
+ l = (BMLoop *) BM_FACE_FIRST_LOOP(f);
do {
if (BM_TestHFlag(l->v, BM_SELECT))
totsel++;
l = l->next;
- } while (l != bm_firstfaceloop(f));
+ } while (l != BM_FACE_FIRST_LOOP(f));
if (totsel == f->len && !BM_TestHFlag(f, BM_HIDDEN)) {
BM_SetHFlag(f, BM_SELECT);
@@ -116,12 +116,12 @@
else if (bm->selectmode & SCE_SELECT_EDGE) {
for (f = BMIter_New(&faces, bm, BM_FACES_OF_MESH, bm); f; f = BMIter_Step(&faces)) {
totsel = 0;
- l = bm_firstfaceloop(f);
+ l = BM_FACE_FIRST_LOOP(f);
do {
if (BM_TestHFlag(&(l->e->head), BM_SELECT))
totsel++;
l = l->next;
- } while (l != bm_firstfaceloop(f));
+ } while (l != BM_FACE_FIRST_LOOP(f));
if (totsel == f->len && !BM_TestHFlag(f, BM_HIDDEN)) {
BM_SetHFlag(f, BM_SELECT);
@@ -250,12 +250,12 @@
if (!BM_TestHFlag(f, BM_SELECT)) bm->totfacesel += 1;
BM_SetHFlag(&(f->head), BM_SELECT);
- l = (BMLoop *) bm_firstfaceloop(f);
+ l = (BMLoop *) BM_FACE_FIRST_LOOP(f);
do {
BM_Select_Vert(bm, l->v, TRUE);
BM_Select_Edge(bm, l->e, TRUE);
l = l->next;
- } while (l != bm_firstfaceloop(f));
+ } while (l != BM_FACE_FIRST_LOOP(f));
}
else {
BMIter liter;
Modified: branches/bmesh/blender/source/blender/bmesh/intern/bmesh_mods.c
===================================================================
--- branches/bmesh/blender/source/blender/bmesh/intern/bmesh_mods.c 2012-02-06 22:21:41 UTC (rev 43935)
+++ branches/bmesh/blender/source/blender/bmesh/intern/bmesh_mods.c 2012-02-06 22:57:25 UTC (rev 43936)
@@ -266,14 +266,14 @@
jed = e;
if (!jed) {
/* search for an edge that has both these faces in its radial cycl */
- l1 = bm_firstfaceloop(f1);
+ l1 = BM_FACE_FIRST_LOOP(f1);
do {
if (l1->radial_next->f == f2) {
jed = l1->e;
break;
}
l1 = l1->next;
- } while (l1 != bm_firstfaceloop(f1));
+ } while (l1 != BM_FACE_FIRST_LOOP(f1));
}
if (!jed) {
@@ -367,17 +367,17 @@
if (has_mdisp && (nf != f)) {
BMLoop *l;
- l = bm_firstfaceloop(f);
+ l = BM_FACE_FIRST_LOOP(f);
do {
BM_loop_interp_from_face(bm, l, of, 0, 1);
l = l->next;
- } while (l != bm_firstfaceloop(f));
+ } while (l != BM_FACE_FIRST_LOOP(f));
- l = bm_firstfaceloop(nf);
+ l = BM_FACE_FIRST_LOOP(nf);
do {
BM_loop_interp_from_face(bm, l, of, 0, 1);
l = l->next;
- } while (l != bm_firstfaceloop(nf));
+ } while (l != BM_FACE_FIRST_LOOP(nf));
BM_Kill_Face(bm, of);
@@ -607,11 +607,11 @@
do {
if (!BLI_smallhash_haskey(&hash, (intptr_t)l->f)) {
- l2 = bm_firstfaceloop(l->f);
+ l2 = BM_FACE_FIRST_LOOP(l->f);
do {
BM_loop_interp_multires(bm, l2, oldfaces[i]);
l2 = l2->next;
- } while (l2 != bm_firstfaceloop(l->f));
+ } while (l2 != BM_FACE_FIRST_LOOP(l->f));
}
l = l->radial_next;
} while (l != e1->l);
Modified: branches/bmesh/blender/source/blender/bmesh/intern/bmesh_newcore.c
===================================================================
--- branches/bmesh/blender/source/blender/bmesh/intern/bmesh_newcore.c 2012-02-06 22:21:41 UTC (rev 43935)
+++ branches/bmesh/blender/source/blender/bmesh/intern/bmesh_newcore.c 2012-02-06 22:57:25 UTC (rev 43936)
@@ -207,7 +207,7 @@
BMFace *f2;
int i;
- l = bm_firstfaceloop(f);
+ l = BM_FACE_FIRST_LOOP(f);
do {
if (copyverts) {
BMVert *v = BM_Make_Vert(bm, l->v->co, l->v);
@@ -217,9 +217,9 @@
BLI_array_append(verts, l->v);
}
l = l->next;
- } while (l != bm_firstfaceloop(f));
+ } while (l != BM_FACE_FIRST_LOOP(f));
- l = bm_firstfaceloop(f);
+ l = BM_FACE_FIRST_LOOP(f);
i = 0;
do {
if (copyedges) {
@@ -244,19 +244,19 @@
i++;
l = l->next;
- } while (l != bm_firstfaceloop(f));
+ } while (l != BM_FACE_FIRST_LOOP(f));
f2 = BM_Make_Face(bm, verts, edges, f->len, 0);
BM_Copy_Attributes(bm, bm, f, f2);
- l = bm_firstfaceloop(f);
- l2 = bm_firstfaceloop(f2);
+ l = BM_FACE_FIRST_LOOP(f);
+ l2 = BM_FACE_FIRST_LOOP(f2);
do {
BM_Copy_Attributes(bm, bm, l, l2);
l = l->next;
l2 = l2->next;
- } while (l != bm_firstfaceloop(f));
+ } while (l != BM_FACE_FIRST_LOOP(f));
return f2;
}
@@ -408,7 +408,7 @@
if (!f->loops.first)
err |= (1 << 16);
- l = bm_firstfaceloop(f);
+ l = BM_FACE_FIRST_LOOP(f);
do {
if (l->f != f) {
fprintf(stderr, "%s: loop inside one face points to another! (bmesh internal error)\n", __func__);
@@ -431,7 +431,7 @@
len++;
l = l->next;
- } while (l != bm_firstfaceloop(f));
+ } while (l != BM_FACE_FIRST_LOOP(f));
if (len != f->len)
err |= (1 << 23);
@@ -509,11 +509,11 @@
BMLoop *l;
int i;
- l = bm_firstfaceloop(f);
+ l = BM_FACE_FIRST_LOOP(f);
do {
BLI_array_append(edges, l->e);
l = l->next;
- } while (l != bm_firstfaceloop(f));
+ } while (l != BM_FACE_FIRST_LOOP(f));
for (i = 0; i < BLI_array_count(edges); i++) {
BM_Kill_Edge(bm, edges[i]);
@@ -529,11 +529,11 @@
BMLoop *l;
int i;
- l = bm_firstfaceloop(f);
+ l = BM_FACE_FIRST_LOOP(f);
do {
BLI_array_append(verts, l->v);
l = l->next;
- } while (l != bm_firstfaceloop(f));
+ } while (l != BM_FACE_FIRST_LOOP(f));
for (i = 0; i < BLI_array_count(verts); i++) {
BM_Kill_Vert(bm, verts[i]);
@@ -861,7 +861,7 @@
for (i = 0; i < totface; i++) {
f = faces[i];
- l = bm_firstfaceloop(f);
+ l = BM_FACE_FIRST_LOOP(f);
do {
int rlen = count_flagged_radial(bm, l, _FLAG_JF);
@@ -902,7 +902,7 @@
}
l = l->next;
- } while (l != bm_firstfaceloop(f));
+ } while (l != BM_FACE_FIRST_LOOP(f));
for (lst = f->loops.first; lst; lst = lst->next) {
if (lst == f->loops.first) continue;
@@ -921,7 +921,7 @@
}
/* copy over loop dat */
- l = bm_firstfaceloop(newf);
+ l = BM_FACE_FIRST_LOOP(newf);
do {
BMLoop *l2 = l->radial_next;
@@ -941,7 +941,7 @@
}
l = l->next;
- } while (l != bm_firstfaceloop(newf));
+ } while (l != BM_FACE_FIRST_LOOP(newf));
BM_Copy_Attributes(bm, bm, faces[0], newf);
@@ -962,14 +962,14 @@
/* handle multires dat */
if (CustomData_has_layer(&bm->ldata, CD_MDISPS)) {
- l = bm_firstfaceloop(newf);
+ l = BM_FACE_FIRST_LOOP(newf);
do {
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list