[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [39264] branches/soc-2011-pepper/source/ blender/collada/AnimationImporter.cpp: Baked Animation re-Import fix

Sukhitha Jayathilake pr.jayathilake at gmail.com
Wed Aug 10 19:51:19 CEST 2011


Revision: 39264
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=39264
Author:   phabtar
Date:     2011-08-10 17:51:18 +0000 (Wed, 10 Aug 2011)
Log Message:
-----------
Baked Animation re-Import fix

Modified Paths:
--------------
    branches/soc-2011-pepper/source/blender/collada/AnimationImporter.cpp

Modified: branches/soc-2011-pepper/source/blender/collada/AnimationImporter.cpp
===================================================================
--- branches/soc-2011-pepper/source/blender/collada/AnimationImporter.cpp	2011-08-10 16:05:20 UTC (rev 39263)
+++ branches/soc-2011-pepper/source/blender/collada/AnimationImporter.cpp	2011-08-10 17:51:18 UTC (rev 39264)
@@ -667,7 +667,7 @@
 				COLLADABU::Math::Matrix4 mat4 = mat->getMatrix();
 				switch (binding->animationClass) {
 					case COLLADAFW::AnimationList::TRANSFORM:
-
+					
 				}
 			}*/
 		case COLLADAFW::Transformation::SKEW:
@@ -815,9 +815,10 @@
 						//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);	
 						}	 			
 				}




More information about the Bf-blender-cvs mailing list