diff options
author | Campbell Barton <ideasman42@gmail.com> | 2011-01-11 10:38:16 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2011-01-11 10:38:16 +0300 |
commit | fded5e5ce5451a10055f615a0d4c83d902aac107 (patch) | |
tree | 00f84ec2022de9ee7c4dfb860e082f2d449383d3 /source/blender/blenkernel/intern/multires.c | |
parent | 37420b2cf20b49599904c9ed9f68ff2eea3dd664 (diff) |
comment/remove unused vars from particle and multires code.
also remove calls to dm->getFaceDataArray() within a loop for particle grid distribution,
instead call this once at the start and reuse the result.
Diffstat (limited to 'source/blender/blenkernel/intern/multires.c')
-rw-r--r-- | source/blender/blenkernel/intern/multires.c | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/source/blender/blenkernel/intern/multires.c b/source/blender/blenkernel/intern/multires.c index 6c1b8fb6047..ed0b1bfceca 100644 --- a/source/blender/blenkernel/intern/multires.c +++ b/source/blender/blenkernel/intern/multires.c @@ -1299,7 +1299,6 @@ static void multires_load_old_dm(DerivedMesh *dm, Mesh *me, int totlvl) unsigned int i, j, totvert; src = 0; - dst = 0; vsrc = mr->verts; vdst = dm->getVertArray(dm); totvert = (unsigned int)dm->getNumVerts(dm); @@ -1428,7 +1427,7 @@ static void multires_load_old_dm(DerivedMesh *dm, Mesh *me, int totlvl) dst = ldst; } - lvl = lvl->next; + /*lvl = lvl->next;*/ /*UNUSED*/ for(i = 0; i < (unsigned int)(mr->level_count - 1); ++i) { MEM_freeN(fmap[i]); @@ -1596,10 +1595,9 @@ void multires_apply_smat(Scene *scene, Object *ob, float smat[3][3]) DMGridData **gridData, **subGridData; Mesh *me= (Mesh*)ob->data; MFace *mface= me->mface; - MVert *mvert= NULL; MDisps *mdisps; int *gridOffset; - int i, numGrids, gridSize, dGridSize, dSkip, totvert; + int i, /*numGrids,*/ gridSize, dGridSize, dSkip, totvert; float (*vertCos)[3] = NULL; MultiresModifierData *mmd= get_multires_modifier(scene, ob); MultiresModifierData high_mmd; @@ -1627,13 +1625,11 @@ void multires_apply_smat(Scene *scene, Object *ob, float smat[3][3]) CDDM_apply_vert_coords(cddm, vertCos); MEM_freeN(vertCos); - mvert= cddm->getVertArray(cddm); - /* scaled ccgDM for tangent space of object with applied scale */ dm= subsurf_dm_create_local(ob, cddm, high_mmd.totlvl, high_mmd.simple, 0); cddm->release(cddm); - numGrids= dm->getNumGrids(dm); + /*numGrids= dm->getNumGrids(dm);*/ /*UNUSED*/ gridSize= dm->getGridSize(dm); gridData= dm->getGridData(dm); gridOffset= dm->getGridOffset(dm); |