collada:custom normals generated by normals modifier have not been exported correctly. Also triangulating during export did not work.

1 files changed, 6 insertions, 5 deletions

diff --git a/source/blender/collada/collada_utils.cpp b/source/blender/collada/collada_utils.cpp
index d3813e2fb7a..e45c8537948 100644
--- a/source/blender/collada/collada_utils.cpp
+++ b/source/blender/collada/collada_utils.cpp
@@ -144,6 +144,7 @@ Mesh *bc_get_mesh_copy(Scene *scene, Object *ob, BC_export_mesh_type export_mesh
 {
 	Mesh *tmpmesh;
 	CustomDataMask mask = CD_MASK_MESH;
+	Mesh *mesh = (Mesh *)ob->data;
 	DerivedMesh *dm = NULL;
 	if (apply_modifiers) {
 		switch (export_mesh_type) {
@@ -165,14 +166,14 @@ Mesh *bc_get_mesh_copy(Scene *scene, Object *ob, BC_export_mesh_type export_mesh
 
 	tmpmesh = BKE_mesh_add(G.main, "ColladaMesh"); // name is not important here
 	DM_to_mesh(dm, tmpmesh, ob, CD_MASK_MESH, true);
+	tmpmesh->flag = mesh->flag;
 
 	if (triangulate) {
-		bc_triangulate_mesh(tmpmesh);
+		BKE_mesh_tessface_calc(tmpmesh);
+	}
+	else {
+		BKE_mesh_tessface_ensure(tmpmesh);
 	}
-
-	// XXX Not sure if we need that for ngon_export as well.
-	BKE_mesh_tessface_ensure(tmpmesh);
-
 	return tmpmesh;
 }