diff options
| author | Dalai Felinto <dfelinto@gmail.com> | 2017-03-29 22:55:04 +0300 |
|---|---|---|
| committer | Dalai Felinto <dfelinto@gmail.com> | 2017-04-04 18:45:55 +0300 |
| commit | fa317eb69c6e7f83cac329f209d7a76916754e76 (patch) | |
| tree | c5986508e8fb5e92280e37f33efa8cbb3b8a0cab /source/blender/collada | |
| parent | 69f7b513b5395931d2ae146c43c0661f8c95732e (diff) | |
Fix collada exporting for Blender 2.8
Instead of exporting all the scene objects, I'm exporting the scene
layer objects instead.
Diffstat (limited to 'source/blender/collada')
| -rw-r--r-- | source/blender/collada/collada.cpp | 3 | ||||
| -rw-r--r-- | source/blender/collada/collada.h | 2 |
2 files changed, 4 insertions, 1 deletions
diff --git a/source/blender/collada/collada.cpp b/source/blender/collada/collada.cpp index bfe3180909b..42d3758d121 100644 --- a/source/blender/collada/collada.cpp +++ b/source/blender/collada/collada.cpp @@ -68,6 +68,7 @@ int collada_import(bContext *C, } int collada_export(Scene *sce, + SceneLayer *scene_layer, const char *filepath, int apply_modifiers, @@ -124,7 +125,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(sce, scene_layer, objectSet, (eObRelationTypes)includeFilter); int export_count = BLI_linklist_count(export_settings.export_set); if (export_count == 0) { diff --git a/source/blender/collada/collada.h b/source/blender/collada/collada.h index 8035af59c8b..c8e6c99206a 100644 --- a/source/blender/collada/collada.h +++ b/source/blender/collada/collada.h @@ -48,6 +48,7 @@ typedef enum BC_export_transformation_type { struct bContext; struct Scene; +struct SceneLayer; /* * both return 1 on success, 0 on error @@ -63,6 +64,7 @@ int collada_import(struct bContext *C, int keep_bind_info); int collada_export(struct Scene *sce, + struct SceneLayer *scene_layer, const char *filepath, int apply_modifiers, BC_export_mesh_type export_mesh_type, |