Merge branch 'master' into blender2.8
[blender.git] / source / blender / collada / DocumentExporter.cpp
index ce0c52cdcd1bf94e6835f55a812f186da8b06b87..6e84c3baccb4a3f8e6921c4cafe9594f7ea003a0 100644 (file)
@@ -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>