diff options
author | Campbell Barton <ideasman42@gmail.com> | 2012-03-20 04:59:51 +0400 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2012-03-20 04:59:51 +0400 |
commit | 1362523ce68122265e430d33cc88373e518d04bd (patch) | |
tree | 89d491aff214b66c3d644419c2d587f91c7b00b3 /source | |
parent | cdfffafd209e1b6178a6cd94372e892f7cf0653a (diff) |
CDDM_calc_edges_tessface was being called twice for boolean and explide modifiers, now leave it up to the caller to run.
Diffstat (limited to 'source')
-rw-r--r-- | source/blender/blenkernel/intern/cdderivedmesh.c | 7 | ||||
-rw-r--r-- | source/blender/modifiers/intern/MOD_explode.c | 1 |
2 files changed, 6 insertions, 2 deletions
diff --git a/source/blender/blenkernel/intern/cdderivedmesh.c b/source/blender/blenkernel/intern/cdderivedmesh.c index 9aa052ef29f..c33e50cccc9 100644 --- a/source/blender/blenkernel/intern/cdderivedmesh.c +++ b/source/blender/blenkernel/intern/cdderivedmesh.c @@ -2576,9 +2576,12 @@ void CDDM_tessfaces_to_faces(DerivedMesh *dm) MEdge *me; EdgeHash *eh = BLI_edgehash_new(); int i, totloop; - - /*ensure we have all the edges we need*/ + + /* ... on second thaughts, better comment this and assume caller knows edge state. */ +#if 0 + /* ensure we have all the edges we need */ CDDM_calc_edges_tessface(dm); +#endif /*build edge hash*/ me = cddm->medge; diff --git a/source/blender/modifiers/intern/MOD_explode.c b/source/blender/modifiers/intern/MOD_explode.c index 05230abdcf5..39beecab22f 100644 --- a/source/blender/modifiers/intern/MOD_explode.c +++ b/source/blender/modifiers/intern/MOD_explode.c @@ -774,6 +774,7 @@ static DerivedMesh * cutEdges(ExplodeModifierData *emd, DerivedMesh *dm) MEM_freeN(facesplit); MEM_freeN(vertpa); + CDDM_calc_edges_tessface(splitdm); CDDM_tessfaces_to_faces(splitdm); /*builds ngon faces from tess (mface) faces*/ return splitdm; |