Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCampbell Barton <ideasman42@gmail.com>2018-02-26 11:33:53 +0300
committerCampbell Barton <ideasman42@gmail.com>2018-02-26 11:35:45 +0300
commitf1bd96a9abc92defedcdfd9a0d57aa41277e8767 (patch)
tree059bb55548616867b054b2589684f2d2340d5eec /source/blender/collada/collada.cpp
parent3fd5a4047ccac755b1924d5caa04d21f99119abb (diff)
Revert "changing collada parameters"
This reverts commit d91f2ac37aa02d96a00d116fa55cdc9f55afd32c. This change makes scene.collada_export() meaningless (ignoring the scene the method is being run on).
Diffstat (limited to 'source/blender/collada/collada.cpp')
-rw-r--r--source/blender/collada/collada.cpp3
1 files changed, 1 insertions, 2 deletions
diff --git a/source/blender/collada/collada.cpp b/source/blender/collada/collada.cpp
index 718ae1d876b..79f50888150 100644
--- a/source/blender/collada/collada.cpp
+++ b/source/blender/collada/collada.cpp
@@ -67,7 +67,7 @@ int collada_import(bContext *C,
return 0;
}
-int collada_export(bContext *C,
+int collada_export(Scene *sce,
const char *filepath,
int apply_modifiers,
@@ -124,7 +124,6 @@ int collada_export(bContext *C,
if (export_settings.include_children) includeFilter |= OB_REL_CHILDREN_RECURSIVE;
eObjectSet objectSet = (export_settings.selected) ? OB_SET_SELECTED : OB_SET_ALL;
- Scene *sce = CTX_data_scene(C);
export_settings.export_set = BKE_object_relational_superset(sce, objectSet, (eObRelationTypes)includeFilter);
int export_count = BLI_linklist_count(export_settings.export_set);