archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

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

Browse Source
This commit is contained in:
Gaia Clary
2015-05-06 17:03:24 +02:00
parent 14d55ab7a3
commit 51f33a2e55
2 changed files with 11 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
source/blender/collada/collada_utils.cpp
View File

@@ -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;
}