[Bf-blender-cvs] [a123dafdc0b] blender-v2.79a-release: fix T52831 removed enforcement of matrix decomposition when animations are exported

[Gaia Clary]

Commit: a123dafdc0be69dad8d22a32360a05eac323fb2e
Author: Gaia Clary
Date:   Thu Sep 21 00:06:11 2017 +0200
Branches: blender-v2.79a-release
https://developer.blender.org/rBa123dafdc0be69dad8d22a32360a05eac323fb2e

fix T52831 removed enforcement of matrix decomposition when animations are exported

===================================================================

M	source/blender/collada/DocumentExporter.cpp

===================================================================

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>