diff options
| author | Dalai Felinto <dfelinto@gmail.com> | 2017-11-08 23:35:31 +0300 |
|---|---|---|
| committer | Dalai Felinto <dfelinto@gmail.com> | 2017-11-08 23:35:31 +0300 |
| commit | 3ceb3512f850028fe6843fdad37cb6271514b9b8 (patch) | |
| tree | 1f8a237a04d9fa4ea33ecf6a8d19b25b1828fefa /source/blender/collada | |
| parent | 2a1e8287114de1c1907d9ef458342c433449c3fa (diff) | |
| parent | 6febe6e725381456f39966e0f685da67cfe52bce (diff) | |
Merge remote-tracking branch 'origin/master' into blender2.8
Diffstat (limited to 'source/blender/collada')
| -rw-r--r-- | source/blender/collada/DocumentExporter.cpp | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/source/blender/collada/DocumentExporter.cpp b/source/blender/collada/DocumentExporter.cpp index 88bc5c3c295..ce0c52cdcd1 100644 --- a/source/blender/collada/DocumentExporter.cpp +++ b/source/blender/collada/DocumentExporter.cpp @@ -288,10 +288,6 @@ int DocumentExporter::exportCurrentScene(const EvaluationContext *eval_ctx, Scen ge.exportGeom(eval_ctx, sce); } - // <library_animations> - AnimationExporter ae(writer, this->export_settings); - bool has_animations = ae.exportAnimations(eval_ctx, sce); - // <library_controllers> ArmatureExporter arm_exporter(writer, this->export_settings); ControllerExporter controller_exporter(writer, this->export_settings); @@ -307,6 +303,11 @@ int DocumentExporter::exportCurrentScene(const EvaluationContext *eval_ctx, Scen /* The following code seems to be an obsolete workaround Comment out until it proofs correct that we no longer need it. */ + + // <library_animations> + AnimationExporter ae(writer, this->export_settings); + bool has_animations = ae.exportAnimations(eval_ctx, sce); + if (has_animations && this->export_settings->export_transformation_type == BC_TRANSFORMATION_TYPE_MATRIX) { // channels adressing <matrix> objects is not (yet) supported // So we force usage of <location>, <translation> and <scale> |