From 8d8403c15ec8694d7d71d8a9f4a9e3a1fade666e Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Tue, 3 Jan 2012 15:28:53 +0000 Subject: for modifiers that are stull creating MFaces - call CDDM_tessfaces_to_faces rather then making an entire copy with CDDM_copy(result, 1) --- source/blender/modifiers/intern/MOD_boolean_util.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) (limited to 'source/blender/modifiers/intern/MOD_boolean_util.c') diff --git a/source/blender/modifiers/intern/MOD_boolean_util.c b/source/blender/modifiers/intern/MOD_boolean_util.c index dfa220ba432..9ae0e515acc 100644 --- a/source/blender/modifiers/intern/MOD_boolean_util.c +++ b/source/blender/modifiers/intern/MOD_boolean_util.c @@ -346,7 +346,7 @@ static DerivedMesh *ConvertCSGDescriptorsToDerivedMesh( DerivedMesh *dm2, Object *ob2) { - DerivedMesh *result, *orig_dm, *dm; + DerivedMesh *result, *orig_dm; GHash *material_hash = NULL; Mesh *me1= (Mesh*)ob1->data; Mesh *me2= (Mesh*)ob2->data; @@ -434,12 +434,9 @@ static DerivedMesh *ConvertCSGDescriptorsToDerivedMesh( CDDM_calc_edges(result); - dm = CDDM_copy(result, 1); /*builds ngon faces from tess (mface) faces*/ - CDDM_calc_normals(dm); - result->needsFree = 1; - result->release(result); + CDDM_tessfaces_to_faces(result); /*builds ngon faces from tess (mface) faces*/ - return dm; + return result; } static void BuildMeshDescriptors( -- cgit v1.2.3