From 86b474a344c452c47666af82c6a8077bea0635e2 Mon Sep 17 00:00:00 2001 From: Joseph Eagar Date: Tue, 15 Sep 2009 15:32:09 +0000 Subject: made subsurf object mode conversion faster, though still needs a bit more work --- source/blender/blenkernel/intern/DerivedMesh.c | 25 +++----- source/blender/blenkernel/intern/cdderivedmesh.c | 8 ++- source/blender/blenkernel/intern/cloth.c | 2 +- source/blender/blenkernel/intern/customdata.c | 36 ++++++++--- source/blender/blenkernel/intern/fluidsim.c | 2 +- source/blender/blenkernel/intern/mesh.c | 2 +- source/blender/blenkernel/intern/modifier.c | 26 ++++---- source/blender/blenkernel/intern/modifiers_bmesh.c | 2 +- source/blender/blenkernel/intern/particle.c | 2 +- source/blender/blenkernel/intern/smoke.c | 2 +- source/blender/blenkernel/intern/subsurf_ccg.c | 73 +++++++++++++--------- 11 files changed, 106 insertions(+), 74 deletions(-) (limited to 'source/blender/blenkernel/intern') diff --git a/source/blender/blenkernel/intern/DerivedMesh.c b/source/blender/blenkernel/intern/DerivedMesh.c index a59ae7e5424..d37a0329582 100644 --- a/source/blender/blenkernel/intern/DerivedMesh.c +++ b/source/blender/blenkernel/intern/DerivedMesh.c @@ -366,16 +366,7 @@ void DM_DupPolys(DerivedMesh *source, DerivedMesh *target) { DMFaceIter *iter = source->newFaceIter(source); DMLoopIter *liter; - int totloop = 0; - - for (; !iter->done; iter->step(iter)) { - liter = iter->getLoopsIter(iter); - for (; !liter->done; liter->step(liter)) { - totloop++; - } - } - - iter->free(iter); + int totloop = source->numLoopData; dm_add_polys_from_iter(&target->loopData, &target->polyData, source, totloop); @@ -1821,6 +1812,8 @@ static void add_weight_mcol_dm(Object *ob, DerivedMesh *dm) } CustomData_add_layer(&dm->loopData, CD_WEIGHT_MLOOPCOL, CD_ASSIGN, wlcol, totloop); + + dfiter->free(dfiter); } /* new value for useDeform -1 (hack for the gameengine): @@ -1965,7 +1958,7 @@ static void mesh_calc_modifiers(Scene *scene, Object *ob, float (*inputVertexCos /* apply vertex coordinates or build a DerivedMesh as necessary */ if(dm) { if(deformedVerts) { - DerivedMesh *tdm = CDDM_copy(dm); + DerivedMesh *tdm = CDDM_copy(dm, 0); dm->release(dm); dm = tdm; @@ -2039,7 +2032,7 @@ static void mesh_calc_modifiers(Scene *scene, Object *ob, float (*inputVertexCos * DerivedMesh then we need to build one. */ if(dm && deformedVerts) { - finaldm = CDDM_copy(dm); + finaldm = CDDM_copy(dm, 0); dm->release(dm); @@ -2180,7 +2173,7 @@ static void editbmesh_calc_modifiers(Scene *scene, Object *ob, BMEditMesh *em, D /* apply vertex coordinates or build a DerivedMesh as necessary */ if(dm) { if(deformedVerts) { - DerivedMesh *tdm = CDDM_copy(dm); + DerivedMesh *tdm = CDDM_copy(dm, 0); if(!(cage_r && dm == *cage_r)) dm->release(dm); dm = tdm; @@ -2189,7 +2182,7 @@ static void editbmesh_calc_modifiers(Scene *scene, Object *ob, BMEditMesh *em, D } else if(cage_r && dm == *cage_r) { /* dm may be changed by this modifier, so we need to copy it */ - dm = CDDM_copy(dm); + dm = CDDM_copy(dm, 0); } } else { @@ -2242,7 +2235,7 @@ static void editbmesh_calc_modifiers(Scene *scene, Object *ob, BMEditMesh *em, D if(cage_r && i == cageIndex) { if(dm && deformedVerts) { - *cage_r = CDDM_copy(dm); + *cage_r = CDDM_copy(dm, 0); CDDM_apply_vert_coords(*cage_r, deformedVerts); } else if(dm) { *cage_r = dm; @@ -2261,7 +2254,7 @@ static void editbmesh_calc_modifiers(Scene *scene, Object *ob, BMEditMesh *em, D * then we need to build one. */ if(dm && deformedVerts) { - *final_r = CDDM_copy(dm); + *final_r = CDDM_copy(dm, 0); if(!(cage_r && dm == *cage_r)) dm->release(dm); diff --git a/source/blender/blenkernel/intern/cdderivedmesh.c b/source/blender/blenkernel/intern/cdderivedmesh.c index 773f0d1eb79..5cc64c9d3e2 100644 --- a/source/blender/blenkernel/intern/cdderivedmesh.c +++ b/source/blender/blenkernel/intern/cdderivedmesh.c @@ -1410,7 +1410,7 @@ DMFaceIter *cdDM_newFaceIter(DerivedMesh *source) return (DMFaceIter*) iter; } -DerivedMesh *CDDM_copy(DerivedMesh *source) +DerivedMesh *CDDM_copy(DerivedMesh *source, int faces_from_tessfaces) { CDDerivedMesh *cddm = cdDM_create("CDDM_copy cddm"); DerivedMesh *dm = &cddm->dm; @@ -1438,8 +1438,10 @@ DerivedMesh *CDDM_copy(DerivedMesh *source) CustomData_add_layer(&dm->edgeData, CD_MEDGE, CD_ASSIGN, cddm->medge, numEdges); CustomData_add_layer(&dm->faceData, CD_MFACE, CD_ASSIGN, cddm->mface, numFaces); - DM_DupPolys(source, dm); - //CDDM_tessfaces_to_faces(dm); + if (!faces_from_tessfaces) + DM_DupPolys(source, dm); + else + CDDM_tessfaces_to_faces(dm); cddm->mloop = CustomData_get_layer(&dm->loopData, CD_MLOOP); cddm->mpoly = CustomData_get_layer(&dm->polyData, CD_MPOLY); diff --git a/source/blender/blenkernel/intern/cloth.c b/source/blender/blenkernel/intern/cloth.c index c3a3f57cd40..2d330748772 100644 --- a/source/blender/blenkernel/intern/cloth.c +++ b/source/blender/blenkernel/intern/cloth.c @@ -432,7 +432,7 @@ DerivedMesh *clothModifier_do(ClothModifierData *clmd, Scene *scene, Object *ob, clmd->scene= scene; /* nice to pass on later :) */ framenr= (int)scene->r.cfra; cache= clmd->point_cache; - result = CDDM_copy(dm); + result = CDDM_copy(dm, 0); BKE_ptcache_id_from_cloth(&pid, ob, clmd); BKE_ptcache_id_time(&pid, scene, framenr, &startframe, &endframe, ×cale); diff --git a/source/blender/blenkernel/intern/customdata.c b/source/blender/blenkernel/intern/customdata.c index bda204409b2..814b85dad2a 100644 --- a/source/blender/blenkernel/intern/customdata.c +++ b/source/blender/blenkernel/intern/customdata.c @@ -922,13 +922,29 @@ static void customData_update_offsets(CustomData *data); static CustomDataLayer *customData_add_layer__internal(CustomData *data, int type, int alloctype, void *layerdata, int totelem, const char *name); +void customData_update_typemap(CustomData *data) +{ + int i, lasttype = -1; + + for (i=0; itypemap[i] = -1; + } + + for (i=0; itotlayer; i++) { + if (data->layers[i].type != lasttype) { + data->typemap[data->layers[i].type] = i; + } + lasttype = data->layers[i].type; + } +} + void CustomData_merge(const struct CustomData *source, struct CustomData *dest, CustomDataMask mask, int alloctype, int totelem) { const LayerTypeInfo *typeInfo; CustomDataLayer *layer, *newlayer; int i, type, number = 0, lasttype = -1, lastactive = 0, lastrender = 0, lastclone = 0, lastmask = 0; - + for(i = 0; i < source->totlayer; ++i) { layer = &source->layers[i]; typeInfo = layerType_getInfo(layer->type); @@ -964,6 +980,8 @@ void CustomData_merge(const struct CustomData *source, struct CustomData *dest, newlayer->active_mask = lastmask; } } + + customData_update_typemap(dest); } void CustomData_copy(const struct CustomData *source, struct CustomData *dest, @@ -1041,11 +1059,12 @@ int CustomData_get_named_layer_index(const CustomData *data, int type, char *nam int CustomData_get_active_layer_index(const CustomData *data, int type) { - int i; + if (!data->totlayer) + return -1; - for(i=0; i < data->totlayer; ++i) - if(data->layers[i].type == type) - return i + data->layers[i].active; + if (data->typemap[type] != -1) { + return data->typemap[type] + data->layers[data->typemap[type]].active; + } return -1; } @@ -1307,6 +1326,7 @@ void *CustomData_add_layer(CustomData *data, int type, int alloctype, layer = customData_add_layer__internal(data, type, alloctype, layerdata, totelem, typeInfo->defaultname); + customData_update_typemap(data); if(layer) return layer->data; @@ -1322,6 +1342,7 @@ void *CustomData_add_layer_named(CustomData *data, int type, int alloctype, layer = customData_add_layer__internal(data, type, alloctype, layerdata, totelem, name); + customData_update_typemap(data); if(layer) return layer->data; @@ -1360,6 +1381,7 @@ int CustomData_free_layer(CustomData *data, int type, int totelem, int index) customData_resize(data, -CUSTOMDATA_GROW); customData_update_offsets(data); + customData_update_typemap(data); return 1; } @@ -1644,7 +1666,7 @@ void *CustomData_get_n(const CustomData *data, int type, int index, int n) int offset; /* get the layer index of the first layer of type */ - layer_index = CustomData_get_layer_index(data, type); + layer_index = data->typemap[type]; if(layer_index < 0) return NULL; offset = layerType_getInfo(type)->size * index; @@ -1996,7 +2018,7 @@ void CustomData_to_bmeshpoly(CustomData *fdata, CustomData *pdata, CustomData *l } else if(fdata->layers[i].type == CD_MCOL) CustomData_add_layer(ldata, CD_MLOOPCOL, CD_CALLOC, &(fdata->layers[i].name), totloop); - } + } } void CustomData_from_bmeshpoly(CustomData *fdata, CustomData *pdata, CustomData *ldata, int total){ int i; diff --git a/source/blender/blenkernel/intern/fluidsim.c b/source/blender/blenkernel/intern/fluidsim.c index 214363b4c79..0024f84d8fb 100644 --- a/source/blender/blenkernel/intern/fluidsim.c +++ b/source/blender/blenkernel/intern/fluidsim.c @@ -226,7 +226,7 @@ DerivedMesh *fluidsimModifier_do(FluidsimModifierData *fluidmd, Scene *scene, Ob } } - result = CDDM_copy(dm); + result = CDDM_copy(dm, 0); if(result) { diff --git a/source/blender/blenkernel/intern/mesh.c b/source/blender/blenkernel/intern/mesh.c index bfd92ff4d9f..35e2989650a 100644 --- a/source/blender/blenkernel/intern/mesh.c +++ b/source/blender/blenkernel/intern/mesh.c @@ -268,7 +268,7 @@ void free_dverts(MDeformVert *dvert, int totvert) /* Free any special data from the verts */ for (i=0; itype==OB_MESH) dm = CDDM_from_mesh(ob->data, ob); else return; @@ -2973,7 +2973,7 @@ static void displaceModifier_deformVertsEM( { DerivedMesh *dm; - if(derivedData) dm = CDDM_copy(derivedData); + if(derivedData) dm = CDDM_copy(derivedData, 0); else dm = CDDM_from_BMEditMesh(editData, ob->data); CDDM_apply_vert_coords(dm, vertexCos); @@ -3639,7 +3639,7 @@ static void smoothModifier_deformVerts( { DerivedMesh *dm; - if(derivedData) dm = CDDM_copy(derivedData); + if(derivedData) dm = CDDM_copy(derivedData, 0); else dm = CDDM_from_mesh(ob->data, ob); CDDM_apply_vert_coords(dm, vertexCos); @@ -3657,7 +3657,7 @@ static void smoothModifier_deformVertsEM( { DerivedMesh *dm; - if(derivedData) dm = CDDM_copy(derivedData); + if(derivedData) dm = CDDM_copy(derivedData, 0); else dm = CDDM_from_BMEditMesh(editData, ob->data); CDDM_apply_vert_coords(dm, vertexCos); @@ -4647,7 +4647,7 @@ static void waveModifier_deformVertsEM( if(!wmd->texture && !wmd->defgrp_name[0] && !(wmd->flag & MOD_WAVE_NORM)) dm = derivedData; - else if(derivedData) dm = CDDM_copy(derivedData); + else if(derivedData) dm = CDDM_copy(derivedData, 0); else dm = CDDM_from_BMEditMesh(editData, ob->data); if(wmd->flag & MOD_WAVE_NORM) { @@ -5259,7 +5259,7 @@ static void collisionModifier_deformVerts( MVert *tempVert = NULL; /* if possible use/create DerivedMesh */ - if(derivedData) dm = CDDM_copy(derivedData); + if(derivedData) dm = CDDM_copy(derivedData, 0); else if(ob->type==OB_MESH) dm = CDDM_from_mesh(ob->data, ob); if(!ob->pd) @@ -5427,7 +5427,7 @@ static void surfaceModifier_deformVerts( surmd->dm->release(surmd->dm); /* if possible use/create DerivedMesh */ - if(derivedData) surmd->dm = CDDM_copy(derivedData); + if(derivedData) surmd->dm = CDDM_copy(derivedData, 0); else surmd->dm = get_original_dm(md->scene, ob, NULL, 0); if(!ob->pd) @@ -5686,7 +5686,7 @@ static void particleSystemModifier_deformVerts( } /* make new dm */ - psmd->dm=CDDM_copy(dm); + psmd->dm=CDDM_copy(dm, 0); CDDM_apply_vert_coords(psmd->dm, vertexCos); CDDM_calc_normals(psmd->dm); @@ -7361,7 +7361,7 @@ static void shrinkwrapModifier_deformVerts(ModifierData *md, Object *ob, Derived /* We implement requiredDataMask but thats not really usefull since mesh_calc_modifiers pass a NULL derivedData or without the modified vertexs applied */ if(dataMask) { - if(derivedData) dm = CDDM_copy(derivedData); + if(derivedData) dm = CDDM_copy(derivedData, 0); else if(ob->type==OB_MESH) dm = CDDM_from_mesh(ob->data, ob); else if(ob->type==OB_LATTICE) dm = NULL; else return; @@ -7386,7 +7386,7 @@ static void shrinkwrapModifier_deformVertsEM(ModifierData *md, Object *ob, BMEdi if(dataMask) { - if(derivedData) dm = CDDM_copy(derivedData); + if(derivedData) dm = CDDM_copy(derivedData, 0); else if(ob->type==OB_MESH) dm = CDDM_from_BMEditMesh(editData, ob->data); else if(ob->type==OB_LATTICE) dm = NULL; else return; @@ -7475,7 +7475,7 @@ static void simpledeformModifier_deformVerts(ModifierData *md, Object *ob, Deriv /* We implement requiredDataMask but thats not really usefull since mesh_calc_modifiers pass a NULL derivedData or without the modified vertexs applied */ if(dataMask) { - if(derivedData) dm = CDDM_copy(derivedData); + if(derivedData) dm = CDDM_copy(derivedData, 0); else if(ob->type==OB_MESH) dm = CDDM_from_mesh(ob->data, ob); else if(ob->type==OB_LATTICE) dm = NULL; else return; @@ -7502,7 +7502,7 @@ static void simpledeformModifier_deformVertsEM(ModifierData *md, Object *ob, BME /* We implement requiredDataMask but thats not really usefull since mesh_calc_modifiers pass a NULL derivedData or without the modified vertexs applied */ if(dataMask) { - if(derivedData) dm = CDDM_copy(derivedData); + if(derivedData) dm = CDDM_copy(derivedData, 0); else if(ob->type==OB_MESH) dm = CDDM_from_BMEditMesh(editData, ob->data); else if(ob->type==OB_LATTICE) dm = NULL; else return; diff --git a/source/blender/blenkernel/intern/modifiers_bmesh.c b/source/blender/blenkernel/intern/modifiers_bmesh.c index d281fb9bd2a..3026fc9d628 100644 --- a/source/blender/blenkernel/intern/modifiers_bmesh.c +++ b/source/blender/blenkernel/intern/modifiers_bmesh.c @@ -598,7 +598,7 @@ DerivedMesh *doMirrorOnAxis(MirrorModifierData *mmd, BMO_Finish_Op(bm, &op); BMEdit_RecalcTesselation(em); - result = CDDM_from_BMEditMesh(em, NULL); //CDDM_copy(getEditDerivedBMesh(em, ob, NULL)); + result = CDDM_from_BMEditMesh(em, NULL); //CDDM_copy(getEditDerivedBMesh(em, ob, NULL), 0); BMEdit_Free(em); MEM_freeN(em); diff --git a/source/blender/blenkernel/intern/particle.c b/source/blender/blenkernel/intern/particle.c index 9aaff82de84..47b37c10689 100644 --- a/source/blender/blenkernel/intern/particle.c +++ b/source/blender/blenkernel/intern/particle.c @@ -606,7 +606,7 @@ void psys_render_set(Object *ob, ParticleSystem *psys, float viewmat[][4], float data->totchildcache= psys->totchildcache; if(psmd->dm) - data->dm= CDDM_copy(psmd->dm); + data->dm= CDDM_copy(psmd->dm, 0); data->totdmvert= psmd->totdmvert; data->totdmedge= psmd->totdmedge; data->totdmface= psmd->totdmface; diff --git a/source/blender/blenkernel/intern/smoke.c b/source/blender/blenkernel/intern/smoke.c index 888ba7c9a5e..91de57024e6 100644 --- a/source/blender/blenkernel/intern/smoke.c +++ b/source/blender/blenkernel/intern/smoke.c @@ -774,7 +774,7 @@ void smokeModifier_do(SmokeModifierData *smd, Scene *scene, Object *ob, DerivedM if(smd->coll->dm) smd->coll->dm->release(smd->coll->dm); - smd->coll->dm = CDDM_copy(dm); + smd->coll->dm = CDDM_copy(dm, 0); // rigid movement support Mat4CpyMat4(smd->coll->mat_old, smd->coll->mat); diff --git a/source/blender/blenkernel/intern/subsurf_ccg.c b/source/blender/blenkernel/intern/subsurf_ccg.c index e93066aafac..73893760f61 100644 --- a/source/blender/blenkernel/intern/subsurf_ccg.c +++ b/source/blender/blenkernel/intern/subsurf_ccg.c @@ -55,11 +55,11 @@ #include "BLI_blenlib.h" #include "BLI_editVert.h" - #include "BLI_arithb.h" #include "BLI_linklist.h" #include "BLI_memarena.h" #include "BLI_edgehash.h" +#include "PIL_time.h" #include "BIF_gl.h" #include "BIF_glutil.h" @@ -85,6 +85,10 @@ struct CCGDerivedMesh { struct {int startVert; int startEdge; CCEdge *edge;} *edgeMap; struct {int startVert; int startEdge; int startFace; CCFace *face;} *faceMap; + /*maps final faces to faceMap faces*/ + int *reverseFaceMap; + + EdgeHash *ehash; }; typedef struct CCGDerivedMesh CCGDerivedMesh; @@ -183,7 +187,7 @@ static int getEdgeIndex(CSubSurf *ss, CCEdge *e, int x, int edgeSize) { } } -static int getFaceIndex(CSubSurf *ss, CCFace *f, int S, int x, int y, int edgeSize, int gridSize) { +BM_INLINE int getFaceIndex(CSubSurf *ss, CCFace *f, int S, int x, int y, int edgeSize, int gridSize) { int faceBase = *((int*) CCS_getFaceUserData(ss, f)); int numVerts = CCS_getFaceNumVerts(f); @@ -558,9 +562,12 @@ static DerivedMesh *ss_to_cdderivedmesh(CSubSurf *ss, int ssFromEditmesh, DerivedMesh *dm, MultiresSubsurf *ms) { DerivedMesh *cgdm, *result; + double curt = PIL_check_seconds_timer(); cgdm = getCCGDerivedMesh(ss, drawInteriorEdges, useSubsurfUv, dm); - result = CDDM_copy(cgdm); + result = CDDM_copy(cgdm, 0); + + printf("subsurf conversion time: %.6lf\n", PIL_check_seconds_timer() - curt); cgdm->needsFree = 1; cgdm->release(cgdm); @@ -1282,10 +1289,10 @@ static void cgdm_getFinalFace(DerivedMesh *dm, int faceNum, MFace *mf) char *faceFlags = dm->getTessFaceDataArray(dm, CD_FLAGS); memset(mf, 0, sizeof(*mf)); + if (faceNum >= cgdm->dm.numFaceData) + return; - i = 0; - while(i < lastface && faceNum >= cgdm->faceMap[i + 1].startFace) - ++i; + i = cgdm->reverseFaceMap[faceNum]; f = cgdm->faceMap[i].face; numVerts = CCS_getFaceNumVerts(f); @@ -1456,7 +1463,7 @@ typedef struct cgdm_loopIter { typedef struct cgdm_faceIter { DMFaceIter head; CCGDerivedMesh *cgdm; - MFace mface; + MFace *mface, *mf; cgdm_loopIter liter; EdgeHash *ehash; /*edge map for populating loopiter->eindex*/ @@ -1478,10 +1485,10 @@ void cgdm_faceIterStep(void *self) return; }; - cgdm_getFinalFace((DerivedMesh*)fiter->cgdm, fiter->head.index, &fiter->mface); + fiter->mf++; - fiter->head.flags = fiter->mface.flag; - fiter->head.mat_nr = fiter->mface.mat_nr; + fiter->head.flags = fiter->mface->flag; + fiter->head.mat_nr = fiter->mface->mat_nr; fiter->head.len = 4; } @@ -1511,25 +1518,25 @@ void cgdm_loopIterStep(void *self) switch (i) { case 0: - v1 = liter->fiter->mface.v1; - v2 = liter->fiter->mface.v2; + v1 = liter->fiter->mf->v1; + v2 = liter->fiter->mf->v2; break; case 1: - v1 = liter->fiter->mface.v2; - v2 = liter->fiter->mface.v3; + v1 = liter->fiter->mf->v2; + v2 = liter->fiter->mf->v3; break; case 2: - v1 = liter->fiter->mface.v3; - v2 = liter->fiter->mface.v4; + v1 = liter->fiter->mf->v3; + v2 = liter->fiter->mf->v4; break; case 3: - v1 = liter->fiter->mface.v4; - v2 = liter->fiter->mface.v1; + v1 = liter->fiter->mf->v4; + v2 = liter->fiter->mf->v1; break; } liter->head.vindex = v1; - liter->head.eindex = GET_INT_FROM_POINTER(BLI_edgehash_lookup(liter->fiter->ehash, v1, v2)); + liter->head.eindex = GET_INT_FROM_POINTER(BLI_edgehash_lookup(liter->fiter->cgdm->ehash, v1, v2)); liter->lindex += 1; cgdm_getFinalVert((DerivedMesh*)liter->cgdm, v1, &liter->head.v); @@ -1567,7 +1574,8 @@ DMLoopIter *cgdm_faceIterGetLIter(void *self) void cgdm_faceIterFree(void *vfiter) { cgdm_faceIter *fiter = vfiter; - BLI_edgehash_free(fiter->ehash, NULL); + + MEM_freeN(fiter->mface); MEM_freeN(fiter); } @@ -1579,12 +1587,8 @@ DMFaceIter *cgdm_newFaceIter(DerivedMesh *dm) fiter->cgdm = dm; fiter->liter.cgdm = dm; - fiter->ehash = BLI_edgehash_new(); - - for (i=0; iehash, medge.v1, medge.v2, SET_INT_IN_POINTER(i)); - } + fiter->mface = fiter->mf = dm->dupTessFaceArray(dm); + fiter->mf--; fiter->head.free = cgdm_faceIterFree; fiter->head.step = cgdm_faceIterStep; @@ -2547,6 +2551,8 @@ static void cgdm_release(DerivedMesh *dm) { MEM_freeN(cgdm->vertMap); MEM_freeN(cgdm->edgeMap); MEM_freeN(cgdm->faceMap); + MEM_freeN(cgdm->reverseFaceMap); + BLI_edgehash_free(cgdm->ehash, NULL); MEM_freeN(cgdm); } } @@ -2638,14 +2644,14 @@ static CCGDerivedMesh *getCCGDerivedMesh(CSubSurf *ss, WeightTable wtable = {0}; /* MVert *mvert = NULL; - as yet unused */ MCol *mcol; - MEdge *medge = NULL; + MEdge *medge = NULL, medge2; MFace *mface = NULL; MPoly *mpoly = NULL; DM_from_template(&cgdm->dm, dm, CCS_getNumFinalVerts(ss), CCS_getNumFinalEdges(ss), CCS_getNumFinalFaces(ss), - CCS_getNumFinalFaces(ss)*4+1, + CCS_getNumFinalFaces(ss)*4, CCS_getNumFinalFaces(ss)); DM_add_tessface_layer(&cgdm->dm, CD_FLAGS, CD_CALLOC, NULL); DM_add_face_layer(&cgdm->dm, CD_FLAGS, CD_CALLOC, NULL); @@ -2738,6 +2744,8 @@ static CCGDerivedMesh *getCCGDerivedMesh(CSubSurf *ss, } CCFIter_free(fi); + cgdm->reverseFaceMap = MEM_callocN(sizeof(int)*CCS_getNumFinalFaces(ss), "reverseFaceMap"); + edgeSize = CCS_getEdgeSize(ss); gridSize = CCS_getGridSize(ss); gridFaces = gridSize - 1; @@ -2884,6 +2892,8 @@ static CCGDerivedMesh *getCCGDerivedMesh(CSubSurf *ss, *faceOrigIndex = origIndex; *polyOrigIndex = origIndex; + cgdm->reverseFaceMap[faceNum] = index; + faceOrigIndex++; polyOrigIndex++; faceNum++; @@ -2972,6 +2982,11 @@ static CCGDerivedMesh *getCCGDerivedMesh(CSubSurf *ss, V_FREE(loopidx); free_ss_weights(&wtable); + cgdm->ehash = BLI_edgehash_new(); + for (i=0; idm.numEdgeData; i++) { + cgdm_getFinalEdge((DerivedMesh*)cgdm, i, &medge2); + BLI_edgehash_insert(cgdm->ehash, medge2.v1, medge2.v2, SET_INT_IN_POINTER(i)); + } #if 0 for(index = 0; index < totface; ++index) { CCFace *f = cgdm->faceMap[index].face; @@ -3273,7 +3288,7 @@ struct DerivedMesh *subsurf_make_derived_from_derived( DerivedMesh *cddm = NULL, *result; if (!CDDM_Check(dm)) { - cddm = CDDM_copy(dm); + cddm = CDDM_copy(dm, 0); dm = cddm; } -- cgit v1.2.3