Revision: 15744
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=15744
Author: nicholasbishop
Date: 2008-07-24 23:36:17 +0200 (Thu, 24 Jul 2008)
Log Message:
-----------
Minor cleanup of some unused multires data
Modified Paths:
--------------
branches/soc-2008-nicholasbishop/source/blender/blenkernel/BKE_multires.h
branches/soc-2008-nicholasbishop/source/blender/blenkernel/intern/cdderivedmesh.c
branches/soc-2008-nicholasbishop/source/blender/blenkernel/intern/multires.c
branches/soc-2008-nicholasbishop/source/blender/src/buttons_editing.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:32:50 UTC (rev 15743)
+++ branches/soc-2008-nicholasbishop/source/blender/blenkernel/BKE_multires.h
2008-07-24 21:36:17 UTC (rev 15744)
@@ -92,9 +92,7 @@
struct ListBase *MultiresDM_get_vert_face_map(struct DerivedMesh *);
int MultiresDM_get_totlvl(struct DerivedMesh *);
int MultiresDM_get_lvl(struct DerivedMesh *);
-int MultiresDM_get_totorfa(struct DerivedMesh *);
int MultiresDM_get_totorco(struct DerivedMesh *);
-int MultiresDM_get_totored(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:32:50 UTC (rev 15743)
+++
branches/soc-2008-nicholasbishop/source/blender/blenkernel/intern/cdderivedmesh.c
2008-07-24 21:36:17 UTC (rev 15744)
@@ -1315,11 +1315,6 @@
return ((MultiresDM*)dm)->orfa;
}
-int MultiresDM_get_totorfa(struct DerivedMesh *dm)
-{
- return ((MultiresDM*)dm)->totorfa;
-}
-
MEdge *MultiresDM_get_ored(DerivedMesh *dm)
{
return ((MultiresDM*)dm)->ored;
Modified:
branches/soc-2008-nicholasbishop/source/blender/blenkernel/intern/multires.c
===================================================================
---
branches/soc-2008-nicholasbishop/source/blender/blenkernel/intern/multires.c
2008-07-24 21:32:50 UTC (rev 15743)
+++
branches/soc-2008-nicholasbishop/source/blender/blenkernel/intern/multires.c
2008-07-24 21:36:17 UTC (rev 15744)
@@ -1472,17 +1472,17 @@
const int gridFaces = multires_side_tot[lvl - 2] - 1;
const int edgeSize = multires_side_tot[lvl - 1] - 1;
ListBase *map = MultiresDM_get_vert_face_map(dm);
+ Mesh *me = MultiresDM_get_mesh(dm);
int S, x, y;
mvert = CDDM_get_verts(dm);
- medge = MultiresDM_get_ored(dm);
- mface = MultiresDM_get_orfa(dm);
+ medge = MultiresDM_get_mesh(dm)->medge;
+ mface = MultiresDM_get_mesh(dm)->mface;
d.subco = MultiresDM_get_subco(dm);
if(lvl < totlvl) {
/* Propagate disps upwards */
- Mesh *me = MultiresDM_get_mesh(dm);
DerivedMesh *orig = CDDM_from_mesh(me, NULL),
*orig_mrdm, *final, *orig_top_mrdm;
MultiresModifierData mmd;
MVert *verts_orig, *verts_new, *orig_top_verts;
@@ -1523,7 +1523,7 @@
}
/* Update the current level */
- for(i = 0; i < MultiresDM_get_totorfa(dm); ++i) {
+ for(i = 0; i < MultiresDM_get_mesh(dm)->totface; ++i) {
const int numVerts = mface[i].v4 ? 4 : 3;
// convert from mvert->co to disps
@@ -1555,7 +1555,7 @@
}
}
- for(i = 0; i < MultiresDM_get_totored(dm); ++i) {
+ for(i = 0; i < MultiresDM_get_mesh(dm)->totedge; ++i) {
const MEdge *e = &medge[i];
for(x = 1; x < edgeSize; ++x) {
IndexNode *n1, *n2;
@@ -1574,7 +1574,7 @@
}
}
- for(i = 0; i < MultiresDM_get_totorco(dm); ++i) {
+ for(i = 0; i < MultiresDM_get_mesh(dm)->totvert; ++i) {
IndexNode *n;
for(n = map[i].first; n; n = n->next) {
multires_displacer_init(&d, dm, n->index, 1);
Modified: branches/soc-2008-nicholasbishop/source/blender/src/buttons_editing.c
===================================================================
--- branches/soc-2008-nicholasbishop/source/blender/src/buttons_editing.c
2008-07-24 21:32:50 UTC (rev 15743)
+++ branches/soc-2008-nicholasbishop/source/blender/src/buttons_editing.c
2008-07-24 21:36:17 UTC (rev 15744)
@@ -1375,7 +1375,7 @@
/* Multires: remove MDisps from the DerivedMesh */
if(md->type == eModifierType_Multires)
- CustomData_free_layers(&dm->faceData, CD_MDISPS,
MultiresDM_get_totorfa(dm));
+ CustomData_free_layers(&dm->faceData, CD_MDISPS,
me->totface);
DM_to_mesh(dm, me);
converted = 1;
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
