[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [18209] branches/soc-2008-nicholasbishop/ source/blender/blenkernel/intern: A couple of very minor cleanups

[Nicholas Bishop]

Revision: 18209
          
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=18209
Author:   nicholasbishop
Date:     2009-01-01 04:25:46 +0100 (Thu, 01 Jan 2009)

Log Message:
-----------
A couple of very minor cleanups

Modified Paths:
--------------
    
branches/soc-2008-nicholasbishop/source/blender/blenkernel/intern/cdderivedmesh.c
    branches/soc-2008-nicholasbishop/source/blender/blenkernel/intern/multires.c

Modified: 
branches/soc-2008-nicholasbishop/source/blender/blenkernel/intern/cdderivedmesh.c
===================================================================
--- 
branches/soc-2008-nicholasbishop/source/blender/blenkernel/intern/cdderivedmesh.c
   2009-01-01 02:20:49 UTC (rev 18208)
+++ 
branches/soc-2008-nicholasbishop/source/blender/blenkernel/intern/cdderivedmesh.c
   2009-01-01 03:25:46 UTC (rev 18209)
@@ -1238,7 +1238,6 @@
                mrdm->orco = MEM_callocN(sizeof(float) * 3 * 
orig->getNumVerts(orig), "multires orco");
                for(i = 0; i < orig->getNumVerts(orig); ++i)
                        VecCopyf(mrdm->orco[i], mvert[i].co);
-               mrdm->me->totvert = orig->getNumVerts(orig);
        }
        else
                DM_init(dm, numVerts, numEdges, numFaces);

Modified: 
branches/soc-2008-nicholasbishop/source/blender/blenkernel/intern/multires.c
===================================================================
--- 
branches/soc-2008-nicholasbishop/source/blender/blenkernel/intern/multires.c    
    2009-01-01 02:20:49 UTC (rev 18208)
+++ 
branches/soc-2008-nicholasbishop/source/blender/blenkernel/intern/multires.c    
    2009-01-01 03:25:46 UTC (rev 18209)
@@ -554,7 +554,6 @@
 typedef struct MultiresDisplacer {
        Mesh *me;
        MDisps *grid;
-       /* To be removed */
        MFace *face;
        
        int dm_first_base_vert_index;
@@ -1193,10 +1192,6 @@
 {
        Mesh *me;
        MDisps *mdisps;
-       MVert *mvert;
-       MEdge *medge;
-       MFace *mface;
-       int i;
 
        if(!(G.f & G_SCULPTMODE) && !(*MultiresDM_get_flags(dm) & 
MULTIRES_DM_UPDATE_ALWAYS)) return;
 
@@ -1206,21 +1201,18 @@
        if(mdisps) {
                const int lvl = MultiresDM_get_lvl(dm);
                const int totlvl = MultiresDM_get_totlvl(dm);
-               DerivedMesh *orig;
                
-               mvert = CDDM_get_verts(dm);
-               medge = MultiresDM_get_mesh(dm)->medge;
-               mface = MultiresDM_get_mesh(dm)->mface;
-
-               orig = CDDM_from_mesh(me, NULL);
-
                if(lvl < totlvl) {
                        /* Propagate disps upwards */
-                       DerivedMesh *final, *subco_dm;
+                       DerivedMesh *final, *subco_dm, *orig;
                        MVert *verts_new = NULL, *cur_lvl_orig_verts = NULL;
                        MultiresModifierData mmd;
+                       int i;
+
+                       orig = CDDM_from_mesh(me, NULL);
                        
-                       /* Regenerate the current level's vertex coordinates 
without sculpting */
+                       /* Regenerate the current level's vertex coordinates
+                          (includes older displacements but not new sculpts) */
                        mmd.totlvl = totlvl;
                        mmd.lvl = lvl;
                        subco_dm = multires_dm_create_from_derived(&mmd, orig, 
me, 0, 0);
@@ -1238,11 +1230,10 @@
                                         dm->getNumFaces(dm), 1);
 
                        subco_dm->release(subco_dm);
+                       orig->release(orig);
                }
                else
                        multiresModifier_disp_run(dm, MultiresDM_get_subco(dm), 
1);
-               
-               orig->release(orig);
        }
 }
 


_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
http://lists.blender.org/mailman/listinfo/bf-blender-cvs