fix T52831 removed enforcement of matrix decomposition when animations are exported
authorGaia Clary <gaia.clary@machinimatrix.org>
Wed, 20 Sep 2017 22:06:11 +0000 (00:06 +0200)
committerGaia Clary <gaia.clary@machinimatrix.org>
Wed, 20 Sep 2017 22:06:11 +0000 (00:06 +0200)
source/blender/collada/DocumentExporter.cpp

index 634071bc90f57a5ac054630beba6771724451ca6..dcfd062470c9a8eecf96a5d96ff027adaa020682 100644 (file)
@@ -305,7 +305,10 @@ int DocumentExporter::exportCurrentScene(Scene *sce)
        // <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.
+       */
        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>
@@ -317,7 +320,9 @@ int DocumentExporter::exportCurrentScene(Scene *sce)
        else {
                se.setExportTransformationType(this->export_settings->export_transformation_type);
        }
-
+#else
+       se.setExportTransformationType(this->export_settings->export_transformation_type);
+#endif
        se.exportScene(sce);
        
        // <scene>