diff options
author | Gaia Clary <gaia.clary@machinimatrix.org> | 2018-02-28 19:10:13 +0300 |
---|---|---|
committer | Gaia Clary <gaia.clary@machinimatrix.org> | 2018-02-28 19:10:57 +0300 |
commit | e73fe77ac09fdad139447b3a00370203049676fc (patch) | |
tree | ad51cde64a8ff2730f5f7dcebd15306f777e6125 /source/blender/collada/DocumentExporter.cpp | |
parent | d937d06c02f62c11385c1c1f58d963fec03365d9 (diff) |
collada: EvaluationContext is now feeded into the class instances of AnimationExporter and DocumentExporter on creation. Also skipped the const qualifier for now because BKE_scene_graph_update_for_newframe() needs it to be not const
Diffstat (limited to 'source/blender/collada/DocumentExporter.cpp')
-rw-r--r-- | source/blender/collada/DocumentExporter.cpp | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/source/blender/collada/DocumentExporter.cpp b/source/blender/collada/DocumentExporter.cpp index 0e020c9011b..437cdac974b 100644 --- a/source/blender/collada/DocumentExporter.cpp +++ b/source/blender/collada/DocumentExporter.cpp @@ -152,7 +152,9 @@ char *bc_CustomData_get_active_layer_name(const CustomData *data, int type) return data->layers[layer_index].name; } -DocumentExporter::DocumentExporter(const ExportSettings *export_settings) : export_settings(export_settings) { +DocumentExporter::DocumentExporter(EvaluationContext *eval_ctx, const ExportSettings *export_settings) : + eval_ctx(eval_ctx), + export_settings(export_settings) { } static COLLADABU::NativeString make_temp_filepath(const char *name, const char *extension) @@ -179,7 +181,7 @@ static COLLADABU::NativeString make_temp_filepath(const char *name, const char * // COLLADA allows this through multiple <channel>s in <animation>. // For this to work, we need to know objects that use a certain action. -int DocumentExporter::exportCurrentScene(EvaluationContext *eval_ctx, Scene *sce) +int DocumentExporter::exportCurrentScene(Scene *sce) { PointerRNA sceneptr, unit_settings; PropertyRNA *system; /* unused , *scale; */ @@ -302,8 +304,8 @@ int DocumentExporter::exportCurrentScene(EvaluationContext *eval_ctx, Scene *sce if (this->export_settings->include_animations) { // <library_animations> - AnimationExporter ae(writer, this->export_settings); - ae.exportAnimations(eval_ctx, sce); + AnimationExporter ae(eval_ctx, writer, this->export_settings); + ae.exportAnimations(sce); } se.exportScene(eval_ctx, sce); |