[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [55001] trunk/blender/source/blender/ collada/DocumentExporter.cpp: Collada: Fix: do not export controllers when shape_key exporting is disabled

[Gaia Clary]

Revision: 55001
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=55001
Author:   gaiaclary
Date:     2013-03-04 00:28:25 +0000 (Mon, 04 Mar 2013)
Log Message:
-----------
Collada: Fix: do not export controllers when shape_key exporting is disabled

Modified Paths:
--------------
    trunk/blender/source/blender/collada/DocumentExporter.cpp

Modified: trunk/blender/source/blender/collada/DocumentExporter.cpp
===================================================================
--- trunk/blender/source/blender/collada/DocumentExporter.cpp	2013-03-04 00:17:20 UTC (rev 55000)
+++ trunk/blender/source/blender/collada/DocumentExporter.cpp	2013-03-04 00:28:25 UTC (rev 55001)
@@ -271,11 +271,10 @@
 	// <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>