diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2018-02-02 06:15:29 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2018-02-02 06:15:29 +0300 |
| commit | c3eb22e2ab0f4f96d64d1de7969966efd5d45066 (patch) | |
| tree | d0472fa9bc46c4ed73fdd8c55e0e4a2616c3178f /source/blender/collada/DocumentExporter.cpp | |
| parent | 7003c8a143dea49a4e4ccc6b26283933d87f4a87 (diff) | |
| parent | 88e69806b977a6ec97c807f5e97db3bf68cff759 (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/collada/DocumentExporter.cpp')
| -rw-r--r-- | source/blender/collada/DocumentExporter.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/source/blender/collada/DocumentExporter.cpp b/source/blender/collada/DocumentExporter.cpp index ce0c52cdcd1..6e84c3baccb 100644 --- a/source/blender/collada/DocumentExporter.cpp +++ b/source/blender/collada/DocumentExporter.cpp @@ -299,15 +299,15 @@ int DocumentExporter::exportCurrentScene(const EvaluationContext *eval_ctx, Scen // <library_visual_scenes> SceneExporter se(writer, &arm_exporter, this->export_settings); -#if 0 - /* 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 0 + /* The following code seems to be an obsolete workaround + Comment out until it proofs correct that we no longer need it. + */ 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> |