From c263753d1770b5b812ea0e5c38174fa296492e2f Mon Sep 17 00:00:00 2001 From: Gaia Clary Date: Mon, 21 Jan 2013 13:45:49 +0000 Subject: Added gsoc-2012 collada improvements from bratwurst branch --- source/blender/collada/AnimationImporter.cpp | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) (limited to 'source/blender/collada/AnimationImporter.cpp') 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]; -- cgit v1.2.3