diff options
author | Gaia Clary <gaia.clary@machinimatrix.org> | 2015-05-27 14:19:40 +0300 |
---|---|---|
committer | Gaia Clary <gaia.clary@machinimatrix.org> | 2015-05-27 14:19:40 +0300 |
commit | 0e00072ff0a95d1205a04b16c54037f371639d3c (patch) | |
tree | 6473a5a24172735a0ac991b63168f9271d2af44d /source | |
parent | 0e02ad8b6495b2755598a24b487041a3ed8e0116 (diff) |
fix:T44856 reverted triangluation back to bmesh ( apparently broken by commit rB51f33 )
Diffstat (limited to 'source')
-rw-r--r-- | source/blender/collada/collada_utils.cpp | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/source/blender/collada/collada_utils.cpp b/source/blender/collada/collada_utils.cpp index e45c8537948..d669487db28 100644 --- a/source/blender/collada/collada_utils.cpp +++ b/source/blender/collada/collada_utils.cpp @@ -169,11 +169,9 @@ Mesh *bc_get_mesh_copy(Scene *scene, Object *ob, BC_export_mesh_type export_mesh tmpmesh->flag = mesh->flag; if (triangulate) { - BKE_mesh_tessface_calc(tmpmesh); - } - else { - BKE_mesh_tessface_ensure(tmpmesh); + bc_triangulate_mesh(tmpmesh); } + BKE_mesh_tessface_ensure(tmpmesh); return tmpmesh; } |