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/subsurf_ccg.c | |
| parent | ff14479983f0606678a9242f869f6b0fc5a78f99 (diff) | |
rename MPoly vars called mface or mf, to avoid confusion with MFace types.
Diffstat (limited to 'source/blender/blenkernel/intern/subsurf_ccg.c')
| -rw-r--r-- | source/blender/blenkernel/intern/subsurf_ccg.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/source/blender/blenkernel/intern/subsurf_ccg.c b/source/blender/blenkernel/intern/subsurf_ccg.c index 6e0149553a2..c34161db0eb 100644 --- a/source/blender/blenkernel/intern/subsurf_ccg.c +++ b/source/blender/blenkernel/intern/subsurf_ccg.c @@ -1270,7 +1270,7 @@ static void ccgDM_copyFinalLoopArray(DerivedMesh *dm, MLoop *mloop) } } -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 @@ static void ccgDM_copyFinalPolyArray(DerivedMesh *dm, MPoly *mface) 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++; |