small fixes and refactoring.

source/blender/collada/AnimationImporter.cpp

@@ -1568,11 +1568,14 @@ bool AnimationImporter::evaluate_animation(COLLADAFW::Transformation *tm, float
 						i++;
 						j = 0;
 					}
+					unused_curves.erase(std::remove(unused_curves.begin(), unused_curves.end(), *it), unused_curves.end());
 				}
 
 				COLLADAFW::Matrix tm(matrix);
 				dae_matrix_to_mat4(&tm, mat);
                 
+				std::vector<FCurve*>::iterator it;
+
 				return true;
 			}
 		}

source/blender/collada/ArmatureExporter.cpp

@@ -39,6 +39,7 @@
 
 #include "BKE_action.h"
 #include "BKE_armature.h"
+#include "ED_armature.h"
 
 #include "BLI_listbase.h"
 
@@ -177,9 +178,9 @@ void ArmatureExporter::add_bone_node(Bone *bone, Object *ob_arm)
 	node.setNodeName(node_name);
 	node.setNodeSid(node_sid);
 
-	if ( bone->childbase.first == NULL || BLI_countlist(&(bone->childbase))>=2)
+	/*if ( bone->childbase.first == NULL || BLI_countlist(&(bone->childbase))>=2)
 		add_blender_leaf_bone( bone, ob_arm , node );
-	else{
+	else{*/
 	node.start();
 
 	add_bone_transform(ob_arm, bone, node);
@@ -189,7 +190,7 @@ void ArmatureExporter::add_bone_node(Bone *bone, Object *ob_arm)
 	}
 
 	node.end();
-	}
+	//}
 }
 
 void ArmatureExporter::add_blender_leaf_bone(Bone *bone, Object *ob_arm, COLLADASW::Node& node)

source/blender/collada/ArmatureImporter.cpp

@@ -183,10 +183,10 @@ void ArmatureImporter::create_bone(SkinInfo& skin, COLLADAFW::Node *node, EditBo
 		else
 			copy_m4_m4(mat, obmat);
 
-		float loc[3], size[3], rot[3][3] , angle;
+		/*float loc[3], size[3], rot[3][3] , angle;
 		mat4_to_loc_rot_size( loc, rot, size, obmat);
 		mat3_to_vec_roll(rot, NULL, &angle );
-		bone->roll=angle;
+		bone->roll=angle;*/
 	}
 
 	
@@ -267,12 +267,15 @@ void ArmatureImporter::add_leaf_bone(float mat[][4], EditBone *bone,  COLLADAFW:
 	copy_m4_m4(leaf.mat, mat);
 	BLI_strncpy(leaf.name, bone->name, sizeof(leaf.name));
 	
+	float vec[3];
+
 	TagsMap::iterator etit;
 	ExtraTags *et = 0;
 	etit = uid_tags_map.find(node->getUniqueId().toAscii());
 	if(etit !=  uid_tags_map.end())
+	{
 		et = etit->second;
-	else return;
+		//else return;
 
 		float x,y,z;
 		et->setData("tip_x",&x);
@@ -281,6 +284,7 @@ void ArmatureImporter::add_leaf_bone(float mat[][4], EditBone *bone,  COLLADAFW:
 		float vec[3] = {x,y,z};
 		copy_v3_v3(leaf.bone->tail, leaf.bone->head);
 	    add_v3_v3v3(leaf.bone->tail, leaf.bone->head, vec);
+	}else
 		leaf_bones.push_back(leaf);
 }
 
@@ -295,7 +299,7 @@ void ArmatureImporter::fix_leaf_bones( )
 		// pointing up
 		float vec[3] = {0.0f, 0.0f, 1.0f};
 		
-		mul_v3_fl(vec, leaf_bone_length);
+		//mul_v3_fl(vec, leaf_bone_length);
 
 		copy_v3_v3(leaf.bone->tail, leaf.bone->head);
 		add_v3_v3v3(leaf.bone->tail, leaf.bone->head, vec);
@@ -418,7 +422,7 @@ void ArmatureImporter::create_armature_bones( )
 	 leaf_bone_length = FLT_MAX;
 		create_unskinned_bone(*ri, NULL, (*ri)->getChildNodes().getCount(), NULL, ob_arm);
 
-		//fix_leaf_bones();
+		fix_leaf_bones();
 
 	// exit armature edit mode