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:
authorBastien Montagne <montagne29@wanadoo.fr>2018-06-14 16:15:51 +0300
committerBastien Montagne <montagne29@wanadoo.fr>2018-06-14 16:15:51 +0300
commitfd19069999e3655206ccf21dc851801a325dea5d (patch)
tree54d5d865c13e42ef50829e6358afdf5790d2df74 /source/blender/collada/DocumentExporter.cpp
parent66407e15cb5136bdbed45b9e0576b1e9863c3f4f (diff)
Cleanup: remove last G.main's from Collada code.
Diffstat (limited to 'source/blender/collada/DocumentExporter.cpp')
-rw-r--r--source/blender/collada/DocumentExporter.cpp7
1 files changed, 4 insertions, 3 deletions
diff --git a/source/blender/collada/DocumentExporter.cpp b/source/blender/collada/DocumentExporter.cpp
index f1838b9dbb6..669faa8358b 100644
--- a/source/blender/collada/DocumentExporter.cpp
+++ b/source/blender/collada/DocumentExporter.cpp
@@ -183,6 +183,7 @@ static COLLADABU::NativeString make_temp_filepath(const char *name, const char *
int DocumentExporter::exportCurrentScene(bContext *C, const EvaluationContext *eval_ctx, Scene *sce)
{
+ Main *bmain = CTX_data_main(C);
PointerRNA sceneptr, unit_settings;
PropertyRNA *system; /* unused , *scale; */
@@ -287,7 +288,7 @@ int DocumentExporter::exportCurrentScene(bContext *C, const EvaluationContext *e
// <library_geometries>
if (bc_has_object_type(export_set, OB_MESH)) {
GeometryExporter ge(writer, this->export_settings);
- ge.exportGeom(sce);
+ ge.exportGeom(bmain, sce);
}
// <library_controllers>
@@ -295,7 +296,7 @@ int DocumentExporter::exportCurrentScene(bContext *C, const EvaluationContext *e
ControllerExporter controller_exporter(writer, this->export_settings);
if (bc_has_object_type(export_set, OB_ARMATURE) || this->export_settings->include_shapekeys)
{
- controller_exporter.export_controllers(sce);
+ controller_exporter.export_controllers(bmain, sce);
}
// <library_visual_scenes>
@@ -305,7 +306,7 @@ int DocumentExporter::exportCurrentScene(bContext *C, const EvaluationContext *e
if (this->export_settings->include_animations) {
// <library_animations>
AnimationExporter ae(writer, this->export_settings);
- ae.exportAnimations(sce);
+ ae.exportAnimations(bmain, sce);
}
se.exportScene(C, sce);