From 26f98446b17f418a633a1420a491e5ad0b59b988 Mon Sep 17 00:00:00 2001
From: Gaia Clary <gaia.clary@machinimatrix.org>
Date: Thu, 21 Sep 2017 00:06:11 +0200
Subject: fix T52831 removed enforcement of matrix decomposition when
 animations are exported

---
 source/blender/collada/DocumentExporter.cpp | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

(limited to 'source/blender/collada')

diff --git a/source/blender/collada/DocumentExporter.cpp b/source/blender/collada/DocumentExporter.cpp
index 634071bc90f..dcfd062470c 100644
--- a/source/blender/collada/DocumentExporter.cpp
+++ b/source/blender/collada/DocumentExporter.cpp
@@ -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>
-- 
cgit v1.2.3