Baked Animation re-Import fix
authorSukhitha Prabhath Jayathilake <pr.jayathilake@gmail.com>
Wed, 10 Aug 2011 17:51:18 +0000 (17:51 +0000)
committerSukhitha Prabhath Jayathilake <pr.jayathilake@gmail.com>
Wed, 10 Aug 2011 17:51:18 +0000 (17:51 +0000)
source/blender/collada/AnimationImporter.cpp

index 4b467c4a1499e3ea4005cfea8f2276633ff6113d..6f3406e88f7c0f52c45a2a10ea126f959f16c3e9 100644 (file)
@@ -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);  
                                                }                               
                                }