diff options
| author | Sukhitha Prabhath Jayathilake <pr.jayathilake@gmail.com> | 2011-07-31 09:04:12 +0400 |
|---|---|---|
| committer | Sukhitha Prabhath Jayathilake <pr.jayathilake@gmail.com> | 2011-07-31 09:04:12 +0400 |
| commit | f3c867c3dbde6919653e7cc712099e48b7508715 (patch) | |
| tree | f9e0be7e480925aca484f960f66970fec49f91ff /source/blender/collada/AnimationImporter.cpp | |
| parent | d3edf274b0d79b37ccde1211f62f3b08c46c1cce (diff) | |
Camera Clipping animation COLLADA support fix.
Diffstat (limited to 'source/blender/collada/AnimationImporter.cpp')
| -rw-r--r-- | source/blender/collada/AnimationImporter.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/source/blender/collada/AnimationImporter.cpp b/source/blender/collada/AnimationImporter.cpp index dad10d91117..8ae2d6970cd 100644 --- a/source/blender/collada/AnimationImporter.cpp +++ b/source/blender/collada/AnimationImporter.cpp @@ -896,14 +896,14 @@ void AnimationImporter::translate_Animations_NEW ( COLLADAFW::Node * node , { const COLLADAFW::AnimatableFloat *zfar = &(camera->getFarClippingPlane()); const COLLADAFW::UniqueId& listid = zfar->getAnimationList(); - Assign_float_animations( listid ,AnimCurves, "clipend"); + Assign_float_animations( listid ,AnimCurves, "clip_end"); } if ((animType->camera & CAMERA_ZNEAR) != 0 ) { const COLLADAFW::AnimatableFloat *znear = &(camera->getNearClippingPlane()); const COLLADAFW::UniqueId& listid = znear->getAnimationList(); - Assign_float_animations( listid ,AnimCurves, "clipsta"); + Assign_float_animations( listid ,AnimCurves, "clip_start"); } } @@ -1009,7 +1009,7 @@ AnimationImporter::AnimMix* AnimationImporter::get_animation_type ( const COLLAD types->material = setAnimType(&(efc->getShininess()),(types->material), MATERIAL_SHININESS); types->material = setAnimType(&(efc->getSpecular().getColor()),(types->material), MATERIAL_SPEC_COLOR); types->material = setAnimType(&(efc->getDiffuse().getColor()),(types->material), MATERIAL_DIFF_COLOR); - + // types->material = setAnimType(&(efc->get()),(types->material), MATERIAL_TRANSPARENCY); } } return types; |