diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2012-04-04 03:40:24 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2012-04-04 03:40:24 +0400 |
| commit | 320aa33e653b5ea74719cf0a1525bffad307be53 (patch) | |
| tree | 9163351ee04ce60f5988acd367d1841a61c1307a /source/blender/blenkernel/intern/particle.c | |
| parent | ff14479983f0606678a9242f869f6b0fc5a78f99 (diff) | |
rename MPoly vars called mface or mf, to avoid confusion with MFace types.
Diffstat (limited to 'source/blender/blenkernel/intern/particle.c')
| -rw-r--r-- | source/blender/blenkernel/intern/particle.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/source/blender/blenkernel/intern/particle.c b/source/blender/blenkernel/intern/particle.c index dd1546d694b..a851c440230 100644 --- a/source/blender/blenkernel/intern/particle.c +++ b/source/blender/blenkernel/intern/particle.c @@ -1616,13 +1616,13 @@ static void psys_origspace_to_w(OrigSpaceFace *osface, int quad, const float w[4 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 @@ int psys_particle_dm_face_lookup(Object *ob, DerivedMesh *dm, int index, const f 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 @@ int psys_particle_dm_face_lookup(Object *ob, DerivedMesh *dm, int index, const f 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 */ |