[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [58351] trunk/blender/source/blender/ collada/ArmatureImporter.cpp: Fix: #36184 Collada import/export...

Gaia Clary gaia.clary at machinimatrix.org
Wed Jul 17 22:22:09 CEST 2013


Revision: 58351
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=58351
Author:   gaiaclary
Date:     2013-07-17 20:22:08 +0000 (Wed, 17 Jul 2013)
Log Message:
-----------
Fix: #36184 Collada import/export... leaf bone size was not set as needed.

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-17 18:19:52 UTC (rev 58350)
+++ trunk/blender/source/blender/collada/ArmatureImporter.cpp	2013-07-17 20:22:08 UTC (rev 58351)
@@ -133,12 +133,8 @@
 	add_v3_v3v3(bone->tail, bone->head, vec);
 
 	// set parent tail
-	if (parent && totchild == 1) {
-		copy_v3_v3(parent->tail, bone->head);
+	if (parent) {
 
-		// not setting BONE_CONNECTED because this would lock child bone location with respect to parent
-		bone->flag |= BONE_CONNECTED;
-
 		// XXX increase this to prevent "very" small bones?
 		const float epsilon = 0.000001f;
 
@@ -148,9 +144,17 @@
 			leaf_bone_length = length;
 		}
 
-		// treat zero-sized bone like a leaf bone
-		if (length <= epsilon) {
-			add_leaf_bone(parent_mat, parent, node);
+		if (totchild == 1) {
+			copy_v3_v3(parent->tail, bone->head);
+
+			// not setting BONE_CONNECTED because this would lock child bone location with respect to parent
+			bone->flag |= BONE_CONNECTED;
+
+
+			// treat zero-sized bone like a leaf bone
+			if (length <= epsilon) {
+				add_leaf_bone(parent_mat, parent, node);
+			}
 		}
 
 	}




More information about the Bf-blender-cvs mailing list