[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [15745] branches/soc-2008-nicholasbishop/ source/blender/blenkernel: Removed some unused data/ functions from the MultiresDM

[Nicholas Bishop]

Revision: 15745
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=15745
Author:   nicholasbishop
Date:     2008-07-24 23:50:54 +0200 (Thu, 24 Jul 2008)

Log Message:
-----------
Removed some unused data/functions from the MultiresDM

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

Modified: branches/soc-2008-nicholasbishop/source/blender/blenkernel/BKE_multires.h
===================================================================
--- branches/soc-2008-nicholasbishop/source/blender/blenkernel/BKE_multires.h	2008-07-24 21:36:17 UTC (rev 15744)
+++ branches/soc-2008-nicholasbishop/source/blender/blenkernel/BKE_multires.h	2008-07-24 21:50:54 UTC (rev 15745)
@@ -88,11 +88,9 @@
 void *MultiresDM_get_orco(struct DerivedMesh *);
 void *MultiresDM_get_subco(struct DerivedMesh *);
 struct MFace *MultiresDM_get_orfa(struct DerivedMesh *);
-struct MEdge *MultiresDM_get_ored(struct DerivedMesh *);
 struct ListBase *MultiresDM_get_vert_face_map(struct DerivedMesh *);
 int MultiresDM_get_totlvl(struct DerivedMesh *);
 int MultiresDM_get_lvl(struct DerivedMesh *);
-int MultiresDM_get_totorco(struct DerivedMesh *);
 void MultiresDM_set_update(struct DerivedMesh *, void (*)(struct DerivedMesh*));
 void MultiresDM_block_update(struct DerivedMesh *);
 

Modified: branches/soc-2008-nicholasbishop/source/blender/blenkernel/intern/cdderivedmesh.c
===================================================================
--- branches/soc-2008-nicholasbishop/source/blender/blenkernel/intern/cdderivedmesh.c	2008-07-24 21:36:17 UTC (rev 15744)
+++ branches/soc-2008-nicholasbishop/source/blender/blenkernel/intern/cdderivedmesh.c	2008-07-24 21:50:54 UTC (rev 15745)
@@ -1158,10 +1158,8 @@
 	int lvl, totlvl;
 	float (*orco)[3];
 	float (*subco)[3];
-	MEdge *ored;
 	MFace *orfa;
 	int totorco;
-	int totored;
 	int totorfa;
 
 	float (*norm)[3];
@@ -1184,7 +1182,6 @@
 		mrdm->update(dm);
 
 	if(DM_release(dm)) {
-		MEM_freeN(mrdm->ored);
 		MEM_freeN(mrdm->orfa);
 		MEM_freeN(mrdm->subco);
 		MEM_freeN(mrdm->orco);
@@ -1253,8 +1250,6 @@
 		mrdm->totorco = orig->getNumVerts(orig);
 		mrdm->orfa = MEM_dupallocN(CustomData_get_layer(&orig->faceData, CD_MFACE));
 		mrdm->totorfa = orig->getNumFaces(orig);
-		mrdm->ored = MEM_dupallocN(CustomData_get_layer(&orig->edgeData, CD_MEDGE));
-		mrdm->totored = orig->getNumEdges(orig);
 	}
 	else
 		DM_init(dm, numVerts, numEdges, numFaces);
@@ -1300,11 +1295,6 @@
 
 }
 
-int MultiresDM_get_totorco(struct DerivedMesh *dm)
-{
-	return ((MultiresDM*)dm)->totorco;
-}
-
 void *MultiresDM_get_subco(DerivedMesh *dm)
 {
 	return ((MultiresDM*)dm)->subco;
@@ -1315,16 +1305,6 @@
 	return ((MultiresDM*)dm)->orfa;
 }
 
-MEdge *MultiresDM_get_ored(DerivedMesh *dm)
-{
-	return ((MultiresDM*)dm)->ored;
-}
-
-int MultiresDM_get_totored(struct DerivedMesh *dm)
-{
-	return ((MultiresDM*)dm)->totored;
-}
-
 int MultiresDM_get_totlvl(DerivedMesh *dm)
 {
 	return ((MultiresDM*)dm)->totlvl;