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/cdderivedmesh.c | |
parent | ff14479983f0606678a9242f869f6b0fc5a78f99 (diff) |
rename MPoly vars called mface or mf, to avoid confusion with MFace types.
Diffstat (limited to 'source/blender/blenkernel/intern/cdderivedmesh.c')
-rw-r--r-- | source/blender/blenkernel/intern/cdderivedmesh.c | 24 |
1 files changed, 15 insertions, 9 deletions
diff --git a/source/blender/blenkernel/intern/cdderivedmesh.c b/source/blender/blenkernel/intern/cdderivedmesh.c index 2b38c5fff4b..03f2851531c 100644 --- a/source/blender/blenkernel/intern/cdderivedmesh.c +++ b/source/blender/blenkernel/intern/cdderivedmesh.c @@ -1467,13 +1467,13 @@ static void cdDM_foreachMappedFaceCenter( { 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 @@ static void cdDM_foreachMappedFaceCenter( 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); |