[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [58636] trunk/blender/source/blender/ collada/ArmatureImporter.cpp: Import of single bones used infinite bone size

[Gaia Clary]

Revision: 58636
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=58636
Author:   gaiaclary
Date:     2013-07-26 22:19:46 +0000 (Fri, 26 Jul 2013)
Log Message:
-----------
Import of single bones used infinite bone size

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

Modified: trunk/blender/source/blender/collada/ArmatureImporter.cpp
===================================================================
--- trunk/blender/source/blender/collada/ArmatureImporter.cpp	2013-07-26 22:11:41 UTC (rev 58635)
+++ trunk/blender/source/blender/collada/ArmatureImporter.cpp	2013-07-26 22:19:46 UTC (rev 58636)
@@ -204,16 +204,21 @@
 
 void ArmatureImporter::fix_leaf_bones( )
 {
+	// Collada only knows Joints, Here we guess a reasonable
+	// leaf bone length
+	float leaf_length = (leaf_bone_length == FLT_MAX) ? 1.0:leaf_bone_length;
+
 	// just setting tail for leaf bones here
 	std::vector<LeafBone>::iterator it;
 	for (it = leaf_bones.begin(); it != leaf_bones.end(); it++) {
+
 		LeafBone& leaf = *it;
 
 		// pointing up
 		float vec[3] = {0.0f, 0.0f, 0.1f};
 		
 		sub_v3_v3v3(vec, leaf.bone->tail , leaf.bone->head);
-		mul_v3_fl(vec, leaf_bone_length);
+		mul_v3_fl(vec, leaf_length);
 		add_v3_v3v3(leaf.bone->tail, leaf.bone->head , vec);
 
 	}