Revision: 45382
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=45382
Author: campbellbarton
Date: 2012-04-03 23:40:24 +0000 (Tue, 03 Apr 2012)
Log Message:
-----------
rename MPoly vars called mface or mf, to avoid confusion with MFace types.
Modified Paths:
--------------
trunk/blender/source/blender/blenkernel/intern/cdderivedmesh.c
trunk/blender/source/blender/blenkernel/intern/particle.c
trunk/blender/source/blender/blenkernel/intern/subsurf_ccg.c
trunk/blender/source/blender/editors/mesh/editface.c
trunk/blender/source/blender/editors/sculpt_paint/paint_vertex.c
trunk/blender/source/blender/editors/space_view3d/drawmesh.c
trunk/blender/source/blender/editors/uvedit/uvedit_draw.c
Modified: trunk/blender/source/blender/blenkernel/intern/cdderivedmesh.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/cdderivedmesh.c
2012-04-03 20:46:58 UTC (rev 45381)
+++ trunk/blender/source/blender/blenkernel/intern/cdderivedmesh.c
2012-04-03 23:40:24 UTC (rev 45382)
@@ -1467,13 +1467,13 @@
{
CDDerivedMesh *cddm = (CDDerivedMesh*)dm;
MVert *mv = cddm->mvert;
- MPoly *mf = cddm->mpoly;
+ MPoly *mp = cddm->mpoly;
MLoop *ml = cddm->mloop;
int i, j, orig, *index;
index = CustomData_get_layer(&dm->polyData, CD_ORIGINDEX);
- mf = cddm->mpoly;
- for (i = 0; i < dm->numPolyData; i++, mf++) {
+ mp = cddm->mpoly;
+ for (i = 0; i < dm->numPolyData; i++, mp++) {
float cent[3];
float no[3];
@@ -1484,20 +1484,26 @@
else
orig = i;
- ml = &cddm->mloop[mf->loopstart];
+ ml = &cddm->mloop[mp->loopstart];
cent[0] = cent[1] = cent[2] = 0.0f;
- for (j=0; j<mf->totloop; j++, ml++) {
+ for (j=0; j<mp->totloop; j++, ml++) {
add_v3_v3v3(cent, cent, mv[ml->v].co);
}
mul_v3_fl(cent, 1.0f / (float)j);
- ml = &cddm->mloop[mf->loopstart];
+ ml = &cddm->mloop[mp->loopstart];
if (j > 3) {
- normal_quad_v3(no, mv[ml->v].co, mv[(ml+1)->v].co,
- mv[(ml+2)->v].co, mv[(ml+3)->v].co);
+ normal_quad_v3(no,
+ mv[(ml + 0)->v].co,
+ mv[(ml + 1)->v].co,
+ mv[(ml + 2)->v].co,
+ mv[(ml + 3)->v].co);
}
else {
- normal_tri_v3(no, mv[ml->v].co, mv[(ml+1)->v].co,
mv[(ml+2)->v].co);
+ normal_tri_v3(no,
+ mv[(ml + 0)->v].co,
+ mv[(ml + 1)->v].co,
+ mv[(ml + 2)->v].co);
}
func(userData, orig, cent, no);
Modified: trunk/blender/source/blender/blenkernel/intern/particle.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/particle.c 2012-04-03
20:46:58 UTC (rev 45381)
+++ trunk/blender/source/blender/blenkernel/intern/particle.c 2012-04-03
23:40:24 UTC (rev 45382)
@@ -1616,13 +1616,13 @@
int psys_particle_dm_face_lookup(Object *ob, DerivedMesh *dm, int index, const
float fw[4], struct LinkNode *node)
{
Mesh *me= (Mesh*)ob->data;
- MPoly *mface;
+ MPoly *mpoly;
OrigSpaceFace *osface;
int *origindex;
int quad, findex, totface;
float uv[2], (*faceuv)[2];
- mface = dm->getPolyArray(dm);
+ mpoly = dm->getPolyArray(dm);
origindex = dm->getTessFaceDataArray(dm, CD_ORIGINDEX);
osface = dm->getTessFaceDataArray(dm, CD_ORIGSPACE);
@@ -1648,7 +1648,7 @@
for (;node; node=node->next) {
findex= GET_INT_FROM_POINTER(node->link);
faceuv= osface[findex].uv;
- quad = (mface[findex].totloop == 4);
+ quad = (mpoly[findex].totloop == 4);
/* check that this intersects - Its possible this
misses :/ -
* could also check its not between */
@@ -1664,7 +1664,7 @@
for (findex=0; findex<totface; findex++) {
if (origindex[findex] == index) {
faceuv= osface[findex].uv;
- quad = (mface[findex].totloop == 4);
+ quad = (mpoly[findex].totloop == 4);
/* check that this intersects - Its possible
this misses :/ -
* could also check its not between */
Modified: trunk/blender/source/blender/blenkernel/intern/subsurf_ccg.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/subsurf_ccg.c
2012-04-03 20:46:58 UTC (rev 45381)
+++ trunk/blender/source/blender/blenkernel/intern/subsurf_ccg.c
2012-04-03 23:40:24 UTC (rev 45382)
@@ -1270,7 +1270,7 @@
}
}
-static void ccgDM_copyFinalPolyArray(DerivedMesh *dm, MPoly *mface)
+static void ccgDM_copyFinalPolyArray(DerivedMesh *dm, MPoly *mpoly)
{
CCGDerivedMesh *ccgdm = (CCGDerivedMesh*) dm;
CCGSubSurf *ss = ccgdm->ss;
@@ -1291,12 +1291,12 @@
for (S = 0; S < numVerts; S++) {
for (y = 0; y < gridSize - 1; y++) {
for (x = 0; x < gridSize - 1; x++) {
- MPoly *mf = &mface[i];
+ MPoly *mp = &mpoly[i];
- mf->mat_nr = mat_nr;
- mf->flag = flag;
- mf->loopstart = k;
- mf->totloop = 4;
+ mp->mat_nr = mat_nr;
+ mp->flag = flag;
+ mp->loopstart = k;
+ mp->totloop = 4;
k += 4;
i++;
Modified: trunk/blender/source/blender/editors/mesh/editface.c
===================================================================
--- trunk/blender/source/blender/editors/mesh/editface.c 2012-04-03
20:46:58 UTC (rev 45381)
+++ trunk/blender/source/blender/editors/mesh/editface.c 2012-04-03
23:40:24 UTC (rev 45382)
@@ -163,26 +163,26 @@
void paintface_hide(Object *ob, const int unselected)
{
Mesh *me;
- MPoly *mface;
+ MPoly *mpoly;
int a;
me = get_mesh(ob);
if (me == NULL || me->totpoly == 0) return;
- mface = me->mpoly;
+ mpoly = me->mpoly;
a = me->totpoly;
while (a--) {
- if ((mface->flag & ME_HIDE) == 0) {
+ if ((mpoly->flag & ME_HIDE) == 0) {
if (unselected) {
- if ( (mface->flag & ME_FACE_SEL) == 0)
mface->flag |= ME_HIDE;
+ if ( (mpoly->flag & ME_FACE_SEL) == 0)
mpoly->flag |= ME_HIDE;
}
else {
- if ( (mface->flag & ME_FACE_SEL)) mface->flag
|= ME_HIDE;
+ if ( (mpoly->flag & ME_FACE_SEL)) mpoly->flag
|= ME_HIDE;
}
}
- if (mface->flag & ME_HIDE) mface->flag &= ~ME_FACE_SEL;
+ if (mpoly->flag & ME_HIDE) mpoly->flag &= ~ME_FACE_SEL;
- mface++;
+ mpoly++;
}
paintface_flush_flags(ob);
@@ -192,20 +192,20 @@
void paintface_reveal(Object *ob)
{
Mesh *me;
- MPoly *mface;
+ MPoly *mpoly;
int a;
me = get_mesh(ob);
if (me == NULL || me->totpoly == 0) return;
- mface = me->mpoly;
+ mpoly = me->mpoly;
a = me->totpoly;
while (a--) {
- if (mface->flag & ME_HIDE) {
- mface->flag |= ME_FACE_SEL;
- mface->flag -= ME_HIDE;
+ if (mpoly->flag & ME_HIDE) {
+ mpoly->flag |= ME_FACE_SEL;
+ mpoly->flag -= ME_HIDE;
}
- mface++;
+ mpoly++;
}
paintface_flush_flags(ob);
@@ -227,7 +227,7 @@
static void select_linked_tfaces_with_seams(int mode, Mesh *me, unsigned int
index)
{
EdgeHash *ehash, *seamhash;
- MPoly *mf;
+ MPoly *mp;
MLoop *ml;
MEdge *med;
char *linkflag;
@@ -243,17 +243,17 @@
if (mode == 0 || mode == 1) {
/* only put face under cursor in array */
- mf = ((MPoly *)me->mpoly) + index;
- hash_add_face(ehash, mf, me->mloop + mf->loopstart);
+ mp = ((MPoly *)me->mpoly) + index;
+ hash_add_face(ehash, mp, me->mloop + mp->loopstart);
linkflag[index] = 1;
}
else {
/* fill array by selection */
- mf = me->mpoly;
- for (a = 0; a < me->totpoly; a++, mf++) {
- if (mf->flag & ME_HIDE) ;
- else if (mf->flag & ME_FACE_SEL) {
- hash_add_face(ehash, mf, me->mloop +
mf->loopstart);
+ mp = me->mpoly;
+ for (a = 0; a < me->totpoly; a++, mp++) {
+ if (mp->flag & ME_HIDE) ;
+ else if (mp->flag & ME_FACE_SEL) {
+ hash_add_face(ehash, mp, me->mloop +
mp->loopstart);
linkflag[a] = 1;
}
}
@@ -263,18 +263,18 @@
doit = 0;
/* expand selection */
- mf = me->mpoly;
- for (a = 0; a < me->totpoly; a++, mf++) {
- if (mf->flag & ME_HIDE)
+ mp = me->mpoly;
+ for (a = 0; a < me->totpoly; a++, mp++) {
+ if (mp->flag & ME_HIDE)
continue;
if (!linkflag[a]) {
MLoop *mnextl;
mark = 0;
- ml = me->mloop + mf->loopstart;
- for (b = 0; b < mf->totloop; b++, ml++) {
- mnextl = b < mf->totloop - 1 ? ml - 1 :
me->mloop + mf->loopstart;
+ ml = me->mloop + mp->loopstart;
+ for (b = 0; b < mp->totloop; b++, ml++) {
+ mnextl = b < mp->totloop - 1 ? ml - 1 :
me->mloop + mp->loopstart;
if (!BLI_edgehash_haskey(seamhash,
ml->v, mnextl->v))
if (!BLI_edgehash_haskey(ehash,
ml->v, mnextl->v))
mark = 1;
@@ -282,7 +282,7 @@
if (mark) {
linkflag[a] = 1;
- hash_add_face(ehash, mf, me->mloop +
mf->loopstart);
+ hash_add_face(ehash, mp, me->mloop +
mp->loopstart);
doit = 1;
}
}
@@ -294,26 +294,26 @@
BLI_edgehash_free(seamhash, NULL);
if (mode == 0 || mode == 2) {
- for (a = 0, mf = me->mpoly; a < me->totpoly; a++, mf++)
+ for (a = 0, mp = me->mpoly; a < me->totpoly; a++, mp++)
if (linkflag[a])
- mf->flag |= ME_FACE_SEL;
+ mp->flag |= ME_FACE_SEL;
else
- mf->flag &= ~ME_FACE_SEL;
+ mp->flag &= ~ME_FACE_SEL;
}
else if (mode == 1) {
- for (a = 0, mf = me->mpoly; a < me->totpoly; a++, mf++)
- if (linkflag[a] && (mf->flag & ME_FACE_SEL))
+ for (a = 0, mp = me->mpoly; a < me->totpoly; a++, mp++)
+ if (linkflag[a] && (mp->flag & ME_FACE_SEL))
break;
if (a < me->totpoly) {
- for (a = 0, mf = me->mpoly; a < me->totpoly; a++, mf++)
+ for (a = 0, mp = me->mpoly; a < me->totpoly; a++, mp++)
if (linkflag[a])
- mf->flag &= ~ME_FACE_SEL;
+ mp->flag &= ~ME_FACE_SEL;
}
else {
- for (a = 0, mf = me->mpoly; a < me->totpoly; a++, mf++)
+ for (a = 0, mp = me->mpoly; a < me->totpoly; a++, mp++)
if (linkflag[a])
- mf->flag |= ME_FACE_SEL;
+ mp->flag |= ME_FACE_SEL;
}
}
@@ -344,54 +344,54 @@
void paintface_deselect_all_visible(Object *ob, int action, short flush_flags)
{
Mesh *me;
- MPoly *mface;
+ MPoly *mpoly;
int a;
me = get_mesh(ob);
if (me == NULL) return;
if (action == SEL_INVERT) {
- mface = me->mpoly;
+ mpoly = me->mpoly;
a = me->totpoly;
while (a--) {
- if ((mface->flag & ME_HIDE) == 0) {
- mface->flag ^= ME_FACE_SEL;
+ if ((mpoly->flag & ME_HIDE) == 0) {
+ mpoly->flag ^= ME_FACE_SEL;
}
- mface++;
+ mpoly++;
}
}
else {
if (action == SEL_TOGGLE) {
action = SEL_SELECT;
- mface = me->mpoly;
+ mpoly = me->mpoly;
a = me->totpoly;
while (a--) {
- if ((mface->flag & ME_HIDE) == 0 && mface->flag
& ME_FACE_SEL) {
+ if ((mpoly->flag & ME_HIDE) == 0 && mpoly->flag
& ME_FACE_SEL) {
action = SEL_DESELECT;
break;
}
- mface++;
+ mpoly++;
}
}
- mface = me->mpoly;
+ mpoly = me->mpoly;
a = me->totpoly;
while (a--) {
- if ((mface->flag & ME_HIDE) == 0) {
+ if ((mpoly->flag & ME_HIDE) == 0) {
switch (action) {
case SEL_SELECT:
- mface->flag |= ME_FACE_SEL;
+ mpoly->flag |= ME_FACE_SEL;
break;
case SEL_DESELECT:
- mface->flag &= ~ME_FACE_SEL;
+ mpoly->flag &= ~ME_FACE_SEL;
break;
case SEL_INVERT:
- mface->flag ^= ME_FACE_SEL;
+ mpoly->flag ^= ME_FACE_SEL;
break;
}
}
- mface++;
+ mpoly++;
}
}
@@ -403,7 +403,7 @@
int paintface_minmax(Object *ob, float *min, float *max)
{
Mesh *me;
- MPoly *mf;
+ MPoly *mp;
MTexPoly *tf;
MLoop *ml;
MVert *mvert;
@@ Diff output truncated at 10240 characters. @@
_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
