[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [49771] branches/soc-2012-bratwurst/source /blender/collada: Morph target export to COLLADA fix

[Sukhitha Jayathilake]

Revision: 49771
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=49771
Author:   phabtar
Date:     2012-08-10 15:25:50 +0000 (Fri, 10 Aug 2012)
Log Message:
-----------
Morph target export to COLLADA fix

Modified Paths:
--------------
    branches/soc-2012-bratwurst/source/blender/collada/DocumentExporter.cpp
    branches/soc-2012-bratwurst/source/blender/collada/GeometryExporter.cpp

Modified: branches/soc-2012-bratwurst/source/blender/collada/DocumentExporter.cpp
===================================================================
--- branches/soc-2012-bratwurst/source/blender/collada/DocumentExporter.cpp	2012-08-10 14:07:24 UTC (rev 49770)
+++ branches/soc-2012-bratwurst/source/blender/collada/DocumentExporter.cpp	2012-08-10 15:25:50 UTC (rev 49771)
@@ -266,9 +266,11 @@
 
 	// <library_controllers>
 	ArmatureExporter arm_exporter(&sw, this->export_settings);
-	if (bc_has_object_type(export_set, OB_ARMATURE)) {
+	//for Morph controller export, removing the check
+	/*if (bc_has_object_type(export_set, OB_ARMATURE)) 
+	{*/
 		arm_exporter.export_controllers(sce);
-	}
+	//}
 
 	// <library_visual_scenes>
 	SceneExporter se(&sw, &arm_exporter, this->export_settings);

Modified: branches/soc-2012-bratwurst/source/blender/collada/GeometryExporter.cpp
===================================================================
--- branches/soc-2012-bratwurst/source/blender/collada/GeometryExporter.cpp	2012-08-10 14:07:24 UTC (rev 49770)
+++ branches/soc-2012-bratwurst/source/blender/collada/GeometryExporter.cpp	2012-08-10 15:25:50 UTC (rev 49771)
@@ -158,9 +158,10 @@
     //shape keys
 	Key * key = ob_get_key(ob);
 	if(key){
-		KeyBlock * kb;
-		for (kb = (KeyBlock*)key->block.first; kb; kb = kb->next) {
-			//have to skip the basis mesh
+		KeyBlock * kb = (KeyBlock*)key->block.first;
+		//skip the basis
+		kb = kb->next;
+		for (; kb; kb = kb->next) {
 			key_to_mesh(kb, me);
 			export_key_mesh(ob, me, kb);
 		}
@@ -215,7 +216,7 @@
 	input_list.push_back(input);
 	verts.add();
 
-	createLooseEdgeList(ob, me, geom_id, norind);
+	//createLooseEdgeList(ob, me, geom_id, norind);
 
 	// XXX slow		
 	if (ob->totcol) {