diff options
Diffstat (limited to 'source/blender/collada')
| -rw-r--r-- | source/blender/collada/MeshImporter.cpp | 2 | ||||
| -rw-r--r-- | source/blender/collada/collada_utils.cpp | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/source/blender/collada/MeshImporter.cpp b/source/blender/collada/MeshImporter.cpp index 65ce7ba5677..306120e464f 100644 --- a/source/blender/collada/MeshImporter.cpp +++ b/source/blender/collada/MeshImporter.cpp @@ -556,7 +556,7 @@ void MeshImporter::mesh_add_edges(Mesh *mesh, int len) totedge = mesh->totedge + len; /* update customdata */ - CustomData_copy(&mesh->edata, &edata, CD_MASK_MESH, CD_DEFAULT, totedge); + CustomData_copy(&mesh->edata, &edata, CD_MASK_MESH.emask, CD_DEFAULT, totedge); CustomData_copy_data(&mesh->edata, &edata, 0, 0, mesh->totedge); if (!CustomData_has_layer(&edata, CD_MEDGE)) diff --git a/source/blender/collada/collada_utils.cpp b/source/blender/collada/collada_utils.cpp index 406d4dabc88..37a4608fe29 100644 --- a/source/blender/collada/collada_utils.cpp +++ b/source/blender/collada/collada_utils.cpp @@ -256,19 +256,19 @@ Mesh *bc_get_mesh_copy( bool apply_modifiers, bool triangulate) { - CustomDataMask mask = CD_MASK_MESH; + CustomData_MeshMasks mask = CD_MASK_MESH; Mesh *tmpmesh = NULL; if (apply_modifiers) { #if 0 /* Not supported by new system currently... */ switch (export_mesh_type) { case BC_MESH_TYPE_VIEW: { - dm = mesh_create_derived_view(depsgraph, scene, ob, mask); + dm = mesh_create_derived_view(depsgraph, scene, ob, &mask); break; } case BC_MESH_TYPE_RENDER: { - dm = mesh_create_derived_render(depsgraph, scene, ob, mask); + dm = mesh_create_derived_render(depsgraph, scene, ob, &mask); break; } } @@ -276,7 +276,7 @@ Mesh *bc_get_mesh_copy( Depsgraph *depsgraph = blender_context.get_depsgraph(); Scene *scene_eval = blender_context.get_evaluated_scene(); Object *ob_eval = blender_context.get_evaluated_object(ob); - tmpmesh = mesh_get_eval_final(depsgraph, scene_eval, ob_eval, mask); + tmpmesh = mesh_get_eval_final(depsgraph, scene_eval, ob_eval, &mask); #endif } else { |