From 78351264195aeb2823470647526feaf404d16848 Mon Sep 17 00:00:00 2001
From: Gaia Clary <gaia.clary@machinimatrix.org>
Date: Mon, 4 Mar 2013 00:28:25 +0000
Subject: Collada: Fix: do not export controllers when shape_key exporting is
 disabled

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

(limited to 'source/blender/collada')

diff --git a/source/blender/collada/DocumentExporter.cpp b/source/blender/collada/DocumentExporter.cpp
index 71909b33db8..09aec2a43a7 100644
--- a/source/blender/collada/DocumentExporter.cpp
+++ b/source/blender/collada/DocumentExporter.cpp
@@ -271,11 +271,10 @@ void DocumentExporter::exportCurrentScene(Scene *sce)
 	// <library_controllers>
 	ArmatureExporter arm_exporter(&sw, this->export_settings);
 	ControllerExporter controller_exporter(&sw , this->export_settings);
-	//for Morph controller export, removing the check
-	/*if (bc_has_object_type(export_set, OB_ARMATURE)) 
-	{*/
-	controller_exporter.export_controllers(sce);
-	//}
+	if (bc_has_object_type(export_set, OB_ARMATURE) || this->export_settings->include_shapekeys) 
+	{
+		controller_exporter.export_controllers(sce);
+	}
 
 	// <library_visual_scenes>
 
-- 
cgit v1.2.3