diff options
| author | Sukhitha Prabhath Jayathilake <pr.jayathilake@gmail.com> | 2011-08-10 21:51:18 +0400 |
|---|---|---|
| committer | Sukhitha Prabhath Jayathilake <pr.jayathilake@gmail.com> | 2011-08-10 21:51:18 +0400 |
| commit | 11d4cfaa715bc1acb194c3b71ffb1635155d39ec (patch) | |
| tree | 9520650b2684c5e88da7b9fafca61365de97698e /source/blender/collada | |
| parent | fafe6e354044d28be71ab76c2211d785773a9c0f (diff) | |
Baked Animation re-Import fix
Diffstat (limited to 'source/blender/collada')
| -rw-r--r-- | source/blender/collada/AnimationImporter.cpp | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/source/blender/collada/AnimationImporter.cpp b/source/blender/collada/AnimationImporter.cpp index 4b467c4a149..6f3406e88f7 100644 --- a/source/blender/collada/AnimationImporter.cpp +++ b/source/blender/collada/AnimationImporter.cpp @@ -667,7 +667,7 @@ void AnimationImporter:: Assign_transform_animations(COLLADAFW::Transformation * COLLADABU::Math::Matrix4 mat4 = mat->getMatrix(); switch (binding->animationClass) { case COLLADAFW::AnimationList::TRANSFORM: - + } }*/ case COLLADAFW::Transformation::SKEW: @@ -815,9 +815,10 @@ void AnimationImporter::translate_Animations_NEW ( COLLADAFW::Node * node , //Add the curves of the current animation to the object for (iter = animcurves.begin(); iter != animcurves.end(); iter++) { FCurve * fcu = *iter; - if (ob->type == OB_ARMATURE) + if ((ob->type == OB_ARMATURE)){ + if ( !is_matrix) add_bone_fcurve( ob, node , fcu ); - else + } else BLI_addtail(AnimCurves, fcu); } } |