diff options
Diffstat (limited to 'source/blender/collada/collada.cpp')
| -rw-r--r-- | source/blender/collada/collada.cpp | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/source/blender/collada/collada.cpp b/source/blender/collada/collada.cpp index 024bc4a4a5c..6c5fb0b33f3 100644 --- a/source/blender/collada/collada.cpp +++ b/source/blender/collada/collada.cpp @@ -67,7 +67,9 @@ int collada_import(bContext *C, return 0; } -int collada_export(Scene *sce, +int collada_export(const EvaluationContext *eval_ctx, + Scene *sce, + ViewLayer *view_layer, const char *filepath, int apply_modifiers, @@ -80,7 +82,7 @@ int collada_export(Scene *sce, int deform_bones_only, int active_uv_only, - BC_export_texture_type export_texture_type, + int include_material_textures, int use_texture_copies, int triangulate, @@ -105,7 +107,7 @@ int collada_export(Scene *sce, export_settings.deform_bones_only = deform_bones_only != 0; export_settings.active_uv_only = active_uv_only != 0; - export_settings.export_texture_type = export_texture_type; + export_settings.include_material_textures= include_material_textures != 0; export_settings.use_texture_copies = use_texture_copies != 0; export_settings.triangulate = triangulate != 0; @@ -122,7 +124,7 @@ int collada_export(Scene *sce, if (export_settings.include_children) includeFilter |= OB_REL_CHILDREN_RECURSIVE; eObjectSet objectSet = (export_settings.selected) ? OB_SET_SELECTED : OB_SET_ALL; - export_settings.export_set = BKE_object_relational_superset(sce, objectSet, (eObRelationTypes)includeFilter); + export_settings.export_set = BKE_object_relational_superset(view_layer, objectSet, (eObRelationTypes)includeFilter); int export_count = BLI_linklist_count(export_settings.export_set); if (export_count == 0) { @@ -139,7 +141,7 @@ int collada_export(Scene *sce, } DocumentExporter exporter(&export_settings); - int status = exporter.exportCurrentScene(sce); + int status = exporter.exportCurrentScene(eval_ctx, sce); BLI_linklist_free(export_settings.export_set, NULL); |