(Due to a change in function call) Added default triangulation method for Collada...
authorGaia Clary <gaia.clary@machinimatrix.org>
Tue, 29 Oct 2013 10:49:44 +0000 (10:49 +0000)
committerGaia Clary <gaia.clary@machinimatrix.org>
Tue, 29 Oct 2013 10:49:44 +0000 (10:49 +0000)
source/blender/collada/collada_utils.cpp

index 8a1b391f07b02025b82b7b3d16ccaa104f45daf8..2e805ce18f1bbc87c87d62e1e8d3a2b6e179dade 100644 (file)
@@ -354,12 +354,14 @@ void bc_match_scale(std::vector<Object *> *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);
 }