diff options
| author | Nathan Letwory <nathan@letworyinteractive.com> | 2010-12-21 13:43:47 +0300 |
|---|---|---|
| committer | Nathan Letwory <nathan@letworyinteractive.com> | 2010-12-21 13:43:47 +0300 |
| commit | c5077e1edea5a1ad246cb19dd51f1cdfa9cbef2f (patch) | |
| tree | 3d1f2fc83c1e687ef0d9d9c7007d7e40c69dfb80 /source/blender/collada | |
| parent | 044e31b89c37c623466e43867bd9ebaf7e26f12d (diff) | |
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.
Diffstat (limited to 'source/blender/collada')
| -rw-r--r-- | source/blender/collada/ArmatureImporter.cpp | 7 | ||||
| -rw-r--r-- | source/blender/collada/ArmatureImporter.h | 3 |
2 files changed, 4 insertions, 6 deletions
diff --git a/source/blender/collada/ArmatureImporter.cpp b/source/blender/collada/ArmatureImporter.cpp index 7bbbc65d6e2..0dae0b6b9cb 100644 --- a/source/blender/collada/ArmatureImporter.cpp +++ b/source/blender/collada/ArmatureImporter.cpp @@ -200,6 +200,7 @@ void ArmatureImporter::fix_leaf_bones() } } +#if 0 void ArmatureImporter::set_leaf_bone_shapes(Object *ob_arm) { bPose *pose = ob_arm->pose; @@ -218,7 +219,6 @@ void ArmatureImporter::set_leaf_bone_shapes(Object *ob_arm) } } -#if 0 void ArmatureImporter::set_euler_rotmode() { // just set rotmode = ROT_MODE_EUL on pose channel for each joint @@ -373,7 +373,7 @@ void ArmatureImporter::create_armature_bones(SkinInfo& skin) 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 @@ void ArmatureImporter::create_armature_bones(SkinInfo& skin) 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(); } diff --git a/source/blender/collada/ArmatureImporter.h b/source/blender/collada/ArmatureImporter.h index a857ab67f12..7111e2fd9af 100644 --- a/source/blender/collada/ArmatureImporter.h +++ b/source/blender/collada/ArmatureImporter.h @@ -105,9 +105,8 @@ private: 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 |