Revision: 38364
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=38364
Author: phabtar
Date: 2011-07-13 16:53:36 +0000 (Wed, 13 Jul 2011)
Log Message:
-----------
Fixed Color animation import( support for Maya )
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-07-13 16:06:53 UTC (rev 38363)
+++ branches/soc-2011-pepper/source/blender/collada/AnimationImporter.cpp
2011-07-13 16:53:36 UTC (rev 38364)
@@ -103,6 +103,7 @@
switch (dim) {
case 1: // X, Y, Z or angle
case 3: // XYZ
+ case 4:
case 16: // matrix
{
for (i = 0; i < dim; i++ ) {
@@ -684,8 +685,10 @@
modify_fcurve(curves, rna_path, 2 );
break;
case COLLADAFW::AnimationList::COLOR_RGB:
+ case COLLADAFW::AnimationList::COLOR_RGBA:
modify_fcurve(curves, rna_path, -1 );
break;
+
default:
fprintf(stderr, "AnimationClass %d is not supported for
%s.\n",
binding->animationClass, "COLOR" );
@@ -885,6 +888,21 @@
const COLLADAFW::UniqueId& listid =
xmag->getAnimationList();
Assign_float_animations( listid ,AnimCurves,
"ortho_scale");
}
+
+ if ((animType->camera & CAMERA_ZFAR) != 0 )
+ {
+ const COLLADAFW::AnimatableFloat *zfar =
&(camera->getFarClippingPlane());
+ const COLLADAFW::UniqueId& listid =
zfar->getAnimationList();
+ Assign_float_animations( listid ,AnimCurves,
"clipend");
+ }
+
+ if ((animType->camera & CAMERA_ZNEAR) != 0 )
+ {
+ const COLLADAFW::AnimatableFloat *znear =
&(camera->getNearClippingPlane());
+ const COLLADAFW::UniqueId& listid =
znear->getAnimationList();
+ Assign_float_animations( listid ,AnimCurves,
"clipsta");
+ }
+
}
}
}
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs