diff options
| author | Gaia Clary <gaia.clary@machinimatrix.org> | 2013-01-21 17:45:49 +0400 |
|---|---|---|
| committer | Gaia Clary <gaia.clary@machinimatrix.org> | 2013-01-21 17:45:49 +0400 |
| commit | c263753d1770b5b812ea0e5c38174fa296492e2f (patch) | |
| tree | fecb2a493596b9078e36c43d723d527e172a9546 /source/blender/collada/AnimationImporter.cpp | |
| parent | 7d286d9a8096438e7a197a2a3f365fbb9df6a0b1 (diff) | |
Added gsoc-2012 collada improvements from bratwurst branch
Diffstat (limited to 'source/blender/collada/AnimationImporter.cpp')
| -rw-r--r-- | source/blender/collada/AnimationImporter.cpp | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/source/blender/collada/AnimationImporter.cpp b/source/blender/collada/AnimationImporter.cpp index 3d0ceb560ed..943c4fb574d 100644 --- a/source/blender/collada/AnimationImporter.cpp +++ b/source/blender/collada/AnimationImporter.cpp @@ -937,10 +937,9 @@ void AnimationImporter::translate_Animations(COLLADAFW::Node *node, if (is_matrix) { apply_matrix_curves(ob, animcurves, root, node, transform); } - else { + else { if (is_joint) { - add_bone_animation_sampled(ob, animcurves, root, node, transform); } else { @@ -1676,8 +1675,6 @@ void AnimationImporter::evaluate_transform_at_frame(float mat[4][4], COLLADAFW:: default: fprintf(stderr, "unsupported transformation type %d\n", type); } - // dae_matrix_to_mat4(tm, m); - } float temp[4][4]; |