[Bf-blender-cvs] [0e00072] master: fix:T44856 reverted triangluation back to bmesh ( apparently broken by commit rB51f33 )

[Gaia Clary]

Commit: 0e00072ff0a95d1205a04b16c54037f371639d3c
Author: Gaia Clary
Date:   Wed May 27 13:19:40 2015 +0200
Branches: master
https://developer.blender.org/rB0e00072ff0a95d1205a04b16c54037f371639d3c

fix:T44856 reverted triangluation back to bmesh ( apparently broken by commit 
rB51f33 )

===================================================================

M       source/blender/collada/collada_utils.cpp

===================================================================

diff --git a/source/blender/collada/collada_utils.cpp 
b/source/blender/collada/collada_utils.cpp
index e45c853..d669487 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;
 }

_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
http://lists.blender.org/mailman/listinfo/bf-blender-cvs