From 055b65d6bad2ce200d3b4315f7754f2cb586e6fe Mon Sep 17 00:00:00 2001 From: Gaia Clary Date: Tue, 29 Oct 2013 10:49:44 +0000 Subject: (Due to a change in function call) Added default triangulation method for Collada exporter --- source/blender/collada/collada_utils.cpp | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/source/blender/collada/collada_utils.cpp b/source/blender/collada/collada_utils.cpp index 8a1b391f07b..2e805ce18f1 100644 --- a/source/blender/collada/collada_utils.cpp +++ b/source/blender/collada/collada_utils.cpp @@ -354,12 +354,14 @@ void bc_match_scale(std::vector *objects_done, void bc_triangulate_mesh(Mesh *me) { - bool use_beauty = false; - bool tag_only = false; + bool use_beauty = false; + bool tag_only = false; + int quad_method = MOD_TRIANGULATE_QUAD_SHORTEDGE; /* XXX: The triangulation method selection could be offered in the UI */ BMesh *bm = BM_mesh_create(&bm_mesh_allocsize_default); BM_mesh_bm_from_me(bm, me, true, false, 0); - BM_mesh_triangulate(bm, use_beauty, tag_only, NULL, NULL, NULL); + BM_mesh_triangulate(bm, quad_method, use_beauty, tag_only, NULL, NULL); + BM_mesh_bm_to_me(bm, me, FALSE); BM_mesh_free(bm); } -- cgit v1.2.3