[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [33832] trunk/blender/source/blender/ collada: Fix [#24359] Collada: end bone zero size, mysterious extra empty

[Nathan Letwory]

Revision: 33832
          
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=33832
Author:   jesterking
Date:     2010-12-21 11:43:47 +0100 (Tue, 21 Dec 2010)

Log Message:
-----------
Fix [#24359] Collada: end bone zero size, mysterious extra empty
Reported by Thomas Larsson
Fix by Jeroen Bakker

Fix max length of leaf bone and remove empty.

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

Modified: trunk/blender/source/blender/collada/ArmatureImporter.cpp
===================================================================
--- trunk/blender/source/blender/collada/ArmatureImporter.cpp   2010-12-21 
09:41:02 UTC (rev 33831)
+++ trunk/blender/source/blender/collada/ArmatureImporter.cpp   2010-12-21 
10:43:47 UTC (rev 33832)
@@ -200,6 +200,7 @@
        }
 }
 
+#if 0
 void ArmatureImporter::set_leaf_bone_shapes(Object *ob_arm)
 {
        bPose *pose = ob_arm->pose;
@@ -218,7 +219,6 @@
        }
 }
 
-#if 0
 void ArmatureImporter::set_euler_rotmode()
 {
        // just set rotmode = ROT_MODE_EUL on pose channel for each joint
@@ -373,7 +373,7 @@
        leaf_bones.clear();
        totbone = 0;
        // bone_direction_row = 1; // TODO: don't default to Y but use asset 
and based on it decide on default row
-       leaf_bone_length = 0.1f;
+       leaf_bone_length = FLT_MAX;
        // min_angle = 360.0f;          // minimum angle between bone head-tail 
and a row of bone matrix
 
        // create bones
@@ -404,8 +404,7 @@
        ED_armature_edit_free(ob_arm);
        DAG_id_tag_update(&ob_arm->id, OB_RECALC_OB|OB_RECALC_DATA);
 
-       set_leaf_bone_shapes(ob_arm);
-
+       // set_leaf_bone_shapes(ob_arm);
        // set_euler_rotmode();
 }
 

Modified: trunk/blender/source/blender/collada/ArmatureImporter.h
===================================================================
--- trunk/blender/source/blender/collada/ArmatureImporter.h     2010-12-21 
09:41:02 UTC (rev 33831)
+++ trunk/blender/source/blender/collada/ArmatureImporter.h     2010-12-21 
10:43:47 UTC (rev 33832)
@@ -105,9 +105,8 @@
 
        void fix_leaf_bones();
 
-       void set_leaf_bone_shapes(Object *ob_arm);
-
 #if 0
+       void set_leaf_bone_shapes(Object *ob_arm);
        void set_euler_rotmode();
 #endif
 


_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
http://lists.blender.org/mailman/listinfo/bf-blender-cvs