diff options
| author | Sukhitha Prabhath Jayathilake <pr.jayathilake@gmail.com> | 2011-07-04 23:41:33 +0400 |
|---|---|---|
| committer | Sukhitha Prabhath Jayathilake <pr.jayathilake@gmail.com> | 2011-07-04 23:41:33 +0400 |
| commit | fa6d80c13b421e92e2f81183dafa9ab756d9f1ad (patch) | |
| tree | 9254d6843d09334718bd302b0e9221111de650b1 /source/blender/collada/AnimationImporter.h | |
| parent | af5d8528579357aabf7e3fbd1d64d2e40d905615 (diff) | |
Diffstat (limited to 'source/blender/collada/AnimationImporter.h')
| -rw-r--r-- | source/blender/collada/AnimationImporter.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/source/blender/collada/AnimationImporter.h b/source/blender/collada/AnimationImporter.h index 9f32edac447..623558c61fa 100644 --- a/source/blender/collada/AnimationImporter.h +++ b/source/blender/collada/AnimationImporter.h @@ -81,7 +81,7 @@ private: void fcurve_deg_to_rad(FCurve *cu); void add_fcurves_to_object(Object *ob, std::vector<FCurve*>& curves, char *rna_path, int array_index, Animation *animated); - + int typeFlag; enum AnimationType @@ -107,7 +107,7 @@ public: virtual void change_eul_to_quat(Object *ob, bAction *act); #endif - void translate_Animations_NEW ( COLLADAFW::Node * Node , + void translate_Animations_NEW ( COLLADAFW::Node * Node , std::map<COLLADAFW::UniqueId, COLLADAFW::Node*>& root_map, std::map<COLLADAFW::UniqueId, Object*>& object_map , std::map<COLLADAFW::UniqueId, const COLLADAFW::Object*> FW_object_map); @@ -122,7 +122,7 @@ public: void Assign_color_animations(const COLLADAFW::AnimationList::AnimationBinding * binding, std::vector<FCurve*>* curves); - void Assign_float_animations(const COLLADAFW::AnimationList::AnimationBinding * binding, + void Assign_float_animations(const COLLADAFW::AnimationList::AnimationBinding * binding, std::vector<FCurve*>* curves, char * anim_type); void modify_fcurve(std::vector<FCurve*>* curves , char* rna_path , int array_index ); @@ -134,7 +134,7 @@ public: std::map<COLLADAFW::UniqueId, COLLADAFW::Node*>& root_map, COLLADAFW::Transformation::TransformationType tm_type, Object *par_job = NULL); - + void find_frames( std::vector<float>* frames , std::vector<FCurve*>* curves ); void find_frames_old( std::vector<float>* frames, COLLADAFW::Node * node, COLLADAFW::Transformation::TransformationType tm_type ); // internal, better make it private |