[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [36660] branches/bmesh/blender/source/ blender: rename BMINDEX_GET/SET to BM_GetIndex/BM_SetIndex
Campbell Barton
ideasman42 at gmail.com
Fri May 13 12:49:28 CEST 2011
Revision: 36660
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=36660
Author: campbellbarton
Date: 2011-05-13 10:49:26 +0000 (Fri, 13 May 2011)
Log Message:
-----------
rename BMINDEX_GET/SET to BM_GetIndex/BM_SetIndex
Modified Paths:
--------------
branches/bmesh/blender/source/blender/blenkernel/intern/cdderivedmesh.c
branches/bmesh/blender/source/blender/blenkernel/intern/editderivedbmesh.c
branches/bmesh/blender/source/blender/bmesh/bmesh.h
branches/bmesh/blender/source/blender/bmesh/bmesh_class.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_polygon.c
branches/bmesh/blender/source/blender/bmesh/operators/bevel.c
branches/bmesh/blender/source/blender/bmesh/operators/createops.c
branches/bmesh/blender/source/blender/bmesh/operators/edgesplitop.c
branches/bmesh/blender/source/blender/bmesh/operators/mesh_conv.c
branches/bmesh/blender/source/blender/bmesh/operators/mirror.c
branches/bmesh/blender/source/blender/bmesh/operators/removedoubles.c
branches/bmesh/blender/source/blender/bmesh/operators/utils.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/editface.c
branches/bmesh/blender/source/blender/editors/mesh/knifetool.c
branches/bmesh/blender/source/blender/editors/mesh/meshtools.c
branches/bmesh/blender/source/blender/editors/object/object_vgroup.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/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_array.c
Modified: branches/bmesh/blender/source/blender/blenkernel/intern/cdderivedmesh.c
===================================================================
--- branches/bmesh/blender/source/blender/blenkernel/intern/cdderivedmesh.c 2011-05-13 10:37:58 UTC (rev 36659)
+++ branches/bmesh/blender/source/blender/blenkernel/intern/cdderivedmesh.c 2011-05-13 10:49:26 UTC (rev 36660)
@@ -1915,7 +1915,7 @@
/* set vert index */
eve = BMIter_New(&iter, bm, BM_VERTS_OF_MESH, NULL);
for (i=0; eve; eve=BMIter_Step(&iter), i++)
- BMINDEX_SET(eve, i);
+ BM_SetIndex(eve, i);
index = dm->getVertDataArray(dm, CD_ORIGINDEX);
@@ -1925,7 +1925,7 @@
VECCOPY(mv->co, eve->co);
- BMINDEX_SET(eve, i);
+ BM_SetIndex(eve, i);
mv->no[0] = eve->no[0] * 32767.0;
mv->no[1] = eve->no[1] * 32767.0;
@@ -1946,10 +1946,10 @@
for (i=0; eed; eed=BMIter_Step(&iter), i++, index++) {
MEdge *med = &medge[i];
- BMINDEX_SET(eed, i);
+ BM_SetIndex(eed, i);
- med->v1 = BMINDEX_GET(eed->v1);
- med->v2 = BMINDEX_GET(eed->v2);
+ med->v1 = BM_GetIndex(eed->v1);
+ med->v2 = BM_GetIndex(eed->v2);
med->flag = ME_EDGEDRAW|ME_EDGERENDER;
if (has_crease)
@@ -1965,7 +1965,7 @@
efa = BMIter_New(&iter, bm, BM_FACES_OF_MESH, NULL);
for (i=0; efa; i++, efa=BMIter_Step(&iter)) {
- BMINDEX_SET(efa, i);
+ BM_SetIndex(efa, i);
}
index = dm->getTessFaceDataArray(dm, CD_ORIGINDEX);
@@ -1974,14 +1974,14 @@
BMLoop **l = em->looptris[i];
efa = l[0]->f;
- mf->v1 = BMINDEX_GET(l[0]->v);
- mf->v2 = BMINDEX_GET(l[1]->v);
- mf->v3 = BMINDEX_GET(l[2]->v);
+ mf->v1 = BM_GetIndex(l[0]->v);
+ mf->v2 = BM_GetIndex(l[1]->v);
+ mf->v3 = BM_GetIndex(l[2]->v);
mf->v4 = 0;
mf->mat_nr = efa->mat_nr;
mf->flag = BMFlags_To_MEFlags(efa);
- *index = add_orig ? BMINDEX_GET(efa) : *(int*)CustomData_bmesh_get(&bm->pdata, efa->head.data, CD_ORIGINDEX);
+ *index = add_orig ? BM_GetIndex(efa) : *(int*)CustomData_bmesh_get(&bm->pdata, efa->head.data, CD_ORIGINDEX);
loops_to_customdata_corners(bm, &dm->faceData, i, l, numCol, numTex);
test_index_face(mf, &dm->faceData, i, 3);
@@ -2000,8 +2000,8 @@
mp->mat_nr = efa->mat_nr;
BM_ITER(l, &liter, bm, BM_LOOPS_OF_FACE, efa) {
- mloop->v = BMINDEX_GET(l->v);
- mloop->e = BMINDEX_GET(l->e);
+ mloop->v = BM_GetIndex(l->v);
+ mloop->e = BM_GetIndex(l->e);
CustomData_from_bmesh_block(&bm->ldata, &dm->loopData, l->head.data, j);
j++;
Modified: branches/bmesh/blender/source/blender/blenkernel/intern/editderivedbmesh.c
===================================================================
--- branches/bmesh/blender/source/blender/blenkernel/intern/editderivedbmesh.c 2011-05-13 10:37:58 UTC (rev 36659)
+++ branches/bmesh/blender/source/blender/blenkernel/intern/editderivedbmesh.c 2011-05-13 10:49:26 UTC (rev 36660)
@@ -391,14 +391,14 @@
eve = BMIter_New(&viter, bmdm->tc->bm, BM_VERTS_OF_MESH, NULL);
for (i=0; eve; eve=BMIter_Step(&viter), i++) {
- BMINDEX_SET(eve, i);
+ BM_SetIndex(eve, i);
}
eed = BMIter_New(&iter, bmdm->tc->bm, BM_EDGES_OF_MESH, NULL);
for(i=0; eed; i++,eed=BMIter_Step(&iter))
func(userData, i,
- bmdm->vertexCos[BMINDEX_GET(eed->v1)],
- bmdm->vertexCos[BMINDEX_GET(eed->v2)]);
+ bmdm->vertexCos[BM_GetIndex(eed->v1)],
+ bmdm->vertexCos[BM_GetIndex(eed->v2)]);
} else {
eed = BMIter_New(&iter, bmdm->tc->bm, BM_EDGES_OF_MESH, NULL);
for(i=0; eed; i++,eed=BMIter_Step(&iter))
@@ -420,15 +420,15 @@
eve = BMIter_New(&viter, bmdm->tc->bm, BM_VERTS_OF_MESH, NULL);
for (i=0; eve; eve=BMIter_Step(&viter), i++) {
- BMINDEX_SET(eve, i);
+ BM_SetIndex(eve, i);
}
glBegin(GL_LINES);
eed = BMIter_New(&iter, bmdm->tc->bm, BM_EDGES_OF_MESH, NULL);
for(i=0; eed; i++,eed=BMIter_Step(&iter)) {
if(!setDrawOptions || setDrawOptions(userData, i)) {
- glVertex3fv(bmdm->vertexCos[BMINDEX_GET(eed->v1)]);
- glVertex3fv(bmdm->vertexCos[BMINDEX_GET(eed->v2)]);
+ glVertex3fv(bmdm->vertexCos[BM_GetIndex(eed->v1)]);
+ glVertex3fv(bmdm->vertexCos[BM_GetIndex(eed->v2)]);
}
}
glEnd();
@@ -463,16 +463,16 @@
eve = BMIter_New(&iter, bmdm->tc->bm, BM_VERTS_OF_MESH, NULL);
for (i=0; eve; eve=BMIter_Step(&iter), i++)
- BMINDEX_SET(eve, i);
+ BM_SetIndex(eve, i);
glBegin(GL_LINES);
eed = BMIter_New(&iter, bmdm->tc->bm, BM_EDGES_OF_MESH, NULL);
for(i=0; eed; i++,eed=BMIter_Step(&iter)) {
if(!setDrawOptions || setDrawOptions(userData, i)) {
setDrawInterpOptions(userData, i, 0.0);
- glVertex3fv(bmdm->vertexCos[(int) BMINDEX_GET(eed->v1)]);
+ glVertex3fv(bmdm->vertexCos[(int) BM_GetIndex(eed->v1)]);
setDrawInterpOptions(userData, i, 1.0);
- glVertex3fv(bmdm->vertexCos[(int) BMINDEX_GET(eed->v2)]);
+ glVertex3fv(bmdm->vertexCos[(int) BM_GetIndex(eed->v2)]);
}
}
glEnd();
@@ -543,7 +543,7 @@
if (vertexCos) {
l = BMIter_New(&iter, bm, BM_LOOPS_OF_FACE, efa);
for (; l; l=BMIter_Step(&iter)) {
- VECADD(cent, cent, vertexCos[BMINDEX_GET(l->v)]);
+ VECADD(cent, cent, vertexCos[BM_GetIndex(l->v)]);
tot++;
}
} else {
@@ -570,7 +570,7 @@
if (bmdm->vertexCos) {
eve = BMIter_New(&iter, bmdm->tc->bm, BM_VERTS_OF_MESH, NULL);
for (i=0; eve; eve=BMIter_Step(&iter), i++)
- BMINDEX_SET(eve, i);
+ BM_SetIndex(eve, i);
}
efa = BMIter_New(&iter, bmdm->tc->bm, BM_FACES_OF_MESH, NULL);
@@ -599,11 +599,11 @@
eve = BMIter_New(&iter, bmdm->tc->bm, BM_VERTS_OF_MESH, NULL);
for (i=0; eve; eve=BMIter_Step(&iter), i++)
- BMINDEX_SET(eve, i);
+ BM_SetIndex(eve, i);
efa = BMIter_New(&iter, bmdm->tc->bm, BM_FACES_OF_MESH, NULL);
for (i=0; efa; efa=BMIter_Step(&iter), i++)
- BMINDEX_SET(efa, i);
+ BM_SetIndex(efa, i);
for (i=0; i<bmdm->tc->tottri; i++) {
BMLoop **l = bmdm->tc->looptris[i];
@@ -612,7 +612,7 @@
efa = l[0]->f;
drawSmooth = (efa->head.flag & BM_SMOOTH);
- draw = setDrawOptions==NULL ? 1 : setDrawOptions(userData, BMINDEX_GET(efa), &drawSmooth);
+ draw = setDrawOptions==NULL ? 1 : setDrawOptions(userData, BM_GetIndex(efa), &drawSmooth);
if(draw) {
if (draw==2) { /* enabled with stipple */
glEnable(GL_POLYGON_STIPPLE);
@@ -625,16 +625,16 @@
if (!drawSmooth) {
glNormal3fv(bmdm->faceNos[i]);
- glVertex3fv(bmdm->vertexCos[(int) BMINDEX_GET(l[0]->v)]);
- glVertex3fv(bmdm->vertexCos[(int) BMINDEX_GET(l[1]->v)]);
- glVertex3fv(bmdm->vertexCos[(int) BMINDEX_GET(l[2]->v)]);
+ glVertex3fv(bmdm->vertexCos[(int) BM_GetIndex(l[0]->v)]);
+ glVertex3fv(bmdm->vertexCos[(int) BM_GetIndex(l[1]->v)]);
+ glVertex3fv(bmdm->vertexCos[(int) BM_GetIndex(l[2]->v)]);
} else {
- glNormal3fv(bmdm->vertexNos[(int) BMINDEX_GET(l[0]->v)]);
- glVertex3fv(bmdm->vertexCos[(int) BMINDEX_GET(l[0]->v)]);
- glNormal3fv(bmdm->vertexNos[(int) BMINDEX_GET(l[1]->v)]);
- glVertex3fv(bmdm->vertexCos[(int) BMINDEX_GET(l[1]->v)]);
- glNormal3fv(bmdm->vertexNos[(int) BMINDEX_GET(l[2]->v)]);
- glVertex3fv(bmdm->vertexCos[(int) BMINDEX_GET(l[2]->v)]);
+ glNormal3fv(bmdm->vertexNos[(int) BM_GetIndex(l[0]->v)]);
+ glVertex3fv(bmdm->vertexCos[(int) BM_GetIndex(l[0]->v)]);
+ glNormal3fv(bmdm->vertexNos[(int) BM_GetIndex(l[1]->v)]);
+ glVertex3fv(bmdm->vertexCos[(int) BM_GetIndex(l[1]->v)]);
+ glNormal3fv(bmdm->vertexNos[(int) BM_GetIndex(l[2]->v)]);
+ glVertex3fv(bmdm->vertexCos[(int) BM_GetIndex(l[2]->v)]);
}
glEnd();
@@ -645,7 +645,7 @@
} else {
efa = BMIter_New(&iter, bmdm->tc->bm, BM_FACES_OF_MESH, NULL);
for (i=0; efa; efa=BMIter_Step(&iter), i++)
- BMINDEX_SET(efa, i);
+ BM_SetIndex(efa, i);
for (i=0; i<bmdm->tc->tottri; i++) {
BMLoop **l = bmdm->tc->looptris[i];
@@ -654,7 +654,7 @@
efa = l[0]->f;
drawSmooth = (efa->head.flag & BM_SMOOTH);
- draw = setDrawOptions==NULL ? 1 : setDrawOptions(userData, BMINDEX_GET(efa), &drawSmooth);
+ draw = setDrawOptions==NULL ? 1 : setDrawOptions(userData, BM_GetIndex(efa), &drawSmooth);
if(draw) {
if (draw==2) { /* enabled with stipple */
glEnable(GL_POLYGON_STIPPLE);
@@ -731,12 +731,12 @@
i = 0;
BM_ITER(efa, &iter, bm, BM_FACES_OF_MESH, NULL)
- BMINDEX_SET(efa, i++);
+ BM_SetIndex(efa, i++);
if (vertexCos) {
i = 0;
BM_ITER(eve, &iter, bm, BM_VERTS_OF_MESH, NULL)
- BMINDEX_SET(eve, i++);
+ BM_SetIndex(eve, i++);
glBegin(GL_TRIANGLES);
for (i=0; i<em->tottri; i++) {
@@ -761,7 +761,7 @@
if(drawParams)
flag= drawParams(&mtf, has_vcol, efa->mat_nr);
else if(drawParamsMapped)
- flag= drawParamsMapped(userData, BMINDEX_GET(efa));
+ flag= drawParamsMapped(userData, BM_GetIndex(efa));
else
flag= 1;
@@ -779,32 +779,32 @@
glTexCoord2fv(luv[0]->uv);
glColor3ub(lcol[0]->b, lcol[0]->g, lcol[0]->r);
- glVertex3fv(vertexCos[BMINDEX_GET(ls[0]->v)]);
+ glVertex3fv(vertexCos[BM_GetIndex(ls[0]->v)]);
glTexCoord2fv(luv[1]->uv);
glColor3ub(lcol[1]->b, lcol[1]->g, lcol[1]->r);
- glVertex3fv(vertexCos[BMINDEX_GET(ls[1]->v)]);
+ glVertex3fv(vertexCos[BM_GetIndex(ls[1]->v)]);
glTexCoord2fv(luv[2]->uv);
glColor3ub(lcol[2]->b, lcol[2]->g, lcol[2]->r);
- glVertex3fv(vertexCos[BMINDEX_GET(ls[2]->v)]);
+ glVertex3fv(vertexCos[BM_GetIndex(ls[2]->v)]);
} else {
bmdm_get_tri_tex(bm, ls, luv, lcol, has_uv, has_vcol);
glTexCoord2fv(luv[0]->uv);
glColor3ub(lcol[0]->b, lcol[0]->g, lcol[0]->r);
- glNormal3fv(vertexNos[BMINDEX_GET(ls[0]->v)]);
- glVertex3fv(vertexCos[BMINDEX_GET(ls[0]->v)]);
+ glNormal3fv(vertexNos[BM_GetIndex(ls[0]->v)]);
+ glVertex3fv(vertexCos[BM_GetIndex(ls[0]->v)]);
glTexCoord2fv(luv[1]->uv);
glColor3ub(lcol[1]->b, lcol[1]->g, lcol[1]->r);
- glNormal3fv(vertexNos[BMINDEX_GET(ls[1]->v)]);
- glVertex3fv(vertexCos[BMINDEX_GET(ls[1]->v)]);
+ glNormal3fv(vertexNos[BM_GetIndex(ls[1]->v)]);
+ glVertex3fv(vertexCos[BM_GetIndex(ls[1]->v)]);
glTexCoord2fv(luv[2]->uv);
glColor3ub(lcol[2]->b, lcol[2]->g, lcol[2]->r);
- glNormal3fv(vertexNos[BMINDEX_GET(ls[2]->v)]);
- glVertex3fv(vertexCos[BMINDEX_GET(ls[2]->v)]);
+ glNormal3fv(vertexNos[BM_GetIndex(ls[2]->v)]);
+ glVertex3fv(vertexCos[BM_GetIndex(ls[2]->v)]);
}
}
}
@@ -812,7 +812,7 @@
} else {
i = 0;
BM_ITER(eve, &iter, bm, BM_VERTS_OF_MESH, NULL)
- BMINDEX_SET(eve, i++);
+ BM_SetIndex(eve, i++);
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list