diff options
| author | Arystanbek Dyussenov <arystan.d@gmail.com> | 2012-02-18 10:22:20 +0400 |
|---|---|---|
| committer | Arystanbek Dyussenov <arystan.d@gmail.com> | 2012-02-18 10:22:20 +0400 |
| commit | f3bef40b0cf2a10bcffedae6c5235e3f5537670f (patch) | |
| tree | 03fb524e8a941258f5468c692ce5c78fd941c8fa /source/blender/collada/AnimationImporter.h | |
| parent | c628f04a7c39bcd178d06448f9ca5e9324141f50 (diff) | |
#collada animation import, bugfix #29082
Fix skeletal animation import for <rotation>, <scale> and <translate> transform types.
Tested for correctness visually using Seymouranim2.dae from http://collada.org/owl and animated creatures from DKGamesModels folder (from private section of the same site). The results match the results in FXComposer-2.5.
Since this is a fix towards correct reading of collada, it shouldn't break existing compatibility with Second Life.
Diffstat (limited to 'source/blender/collada/AnimationImporter.h')
| -rw-r--r-- | source/blender/collada/AnimationImporter.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/source/blender/collada/AnimationImporter.h b/source/blender/collada/AnimationImporter.h index 118a50b0480..5fb96017dee 100644 --- a/source/blender/collada/AnimationImporter.h +++ b/source/blender/collada/AnimationImporter.h @@ -153,6 +153,8 @@ public: void apply_matrix_curves( Object * ob, std::vector<FCurve*>& animcurves, COLLADAFW::Node* root ,COLLADAFW::Node* node, COLLADAFW::Transformation * tm ); + void add_bone_animation_sampled(Object * ob, std::vector<FCurve*>& animcurves, COLLADAFW::Node* root ,COLLADAFW::Node* node, COLLADAFW::Transformation * tm); + void Assign_transform_animations(COLLADAFW::Transformation* transform , const COLLADAFW::AnimationList::AnimationBinding * binding, std::vector<FCurve*>* curves, bool is_joint, char * joint_path); |