From 61a5cc28bef0a7758aba179986cd8393a5425158 Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Sun, 22 Jan 2012 21:12:18 +0000 Subject: disable re-tesselation for modifiers that use bmesh, array/bevel/edge split - were tesselating 2 times and didnt need to. also comment array modifier from flushing selection flags. --- source/blender/modifiers/intern/MOD_bevel.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'source/blender/modifiers/intern/MOD_bevel.c') diff --git a/source/blender/modifiers/intern/MOD_bevel.c b/source/blender/modifiers/intern/MOD_bevel.c index dc2a3588884..75136e444e6 100644 --- a/source/blender/modifiers/intern/MOD_bevel.c +++ b/source/blender/modifiers/intern/MOD_bevel.c @@ -123,7 +123,7 @@ static DerivedMesh *applyModifier(ModifierData *md, struct Object *ob, cddm = CDDM_copy(dm, 0); } else cddm = dm; - em = CDDM_To_BMesh(ob, dm, NULL); + em = CDDM_To_BMesh(ob, dm, NULL, FALSE); bm = em->bm; BM_Compute_Normals(bm); @@ -152,13 +152,13 @@ static DerivedMesh *applyModifier(ModifierData *md, struct Object *ob, BMO_CallOpf(bm, "bevel geom=%fe percent=%f use_even=%i use_dist=%i", EDGE_MARK, bmd->value, (bmd->flags & BME_BEVEL_EVEN)!=0, (bmd->flags & BME_BEVEL_DIST)!=0); BMO_pop(bm); - BMEdit_RecalcTesselation(em); if (cddm != dm) { cddm->needsFree = 1; cddm->release(cddm); } + BLI_assert(em->looptris == NULL); cddm = CDDM_from_BMEditMesh(em, NULL, TRUE, FALSE); BMEdit_Free(em); MEM_freeN(em); -- cgit v1.2.3