diff options
| author | Sergey Sharybin <sergey.vfx@gmail.com> | 2018-02-02 14:21:24 +0300 |
|---|---|---|
| committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2018-02-02 14:21:24 +0300 |
| commit | 26dff781b3c13ad21010d595d38baa5b8b6e06a5 (patch) | |
| tree | bee08064424f2c1efce4fbb8f17ce8ce5b086a79 /source/blender/collada/DocumentExporter.cpp | |
| parent | c3eb22e2ab0f4f96d64d1de7969966efd5d45066 (diff) | |
| parent | 37beac8eb823bd81b411426bfc8718639577b179 (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/collada/DocumentExporter.cpp')
| -rw-r--r-- | source/blender/collada/DocumentExporter.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/source/blender/collada/DocumentExporter.cpp b/source/blender/collada/DocumentExporter.cpp index 6e84c3baccb..179644db9b3 100644 --- a/source/blender/collada/DocumentExporter.cpp +++ b/source/blender/collada/DocumentExporter.cpp @@ -302,9 +302,9 @@ int DocumentExporter::exportCurrentScene(const EvaluationContext *eval_ctx, Scen // <library_animations> AnimationExporter ae(writer, this->export_settings); - bool has_animations = ae.exportAnimations(eval_ctx, sce); #if 0 + bool has_animations = ae.exportAnimations(eval_ctx, sce); /* The following code seems to be an obsolete workaround Comment out until it proofs correct that we no longer need it. */ @@ -320,6 +320,7 @@ int DocumentExporter::exportCurrentScene(const EvaluationContext *eval_ctx, Scen se.setExportTransformationType(this->export_settings->export_transformation_type); } #else + ae.exportAnimations(sce); se.setExportTransformationType(this->export_settings->export_transformation_type); #endif se.exportScene(eval_ctx, sce); |