diff options
| author | Sukhitha Prabhath Jayathilake <pr.jayathilake@gmail.com> | 2011-07-03 17:01:52 +0400 |
|---|---|---|
| committer | Sukhitha Prabhath Jayathilake <pr.jayathilake@gmail.com> | 2011-07-03 17:01:52 +0400 |
| commit | aa295bb5519fc6c004d13de9ff1f5dd1a6eb359a (patch) | |
| tree | e21a1655aa11f1e30711c60b49bdd4169f9d0c48 /source/blender/collada/AnimationImporter.h | |
| parent | 9f99e5cc1e971acad3da44ac78123a46f208ac4b (diff) | |
AnimationType flag. AnimationType Enum update.
Diffstat (limited to 'source/blender/collada/AnimationImporter.h')
| -rw-r--r-- | source/blender/collada/AnimationImporter.h | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/source/blender/collada/AnimationImporter.h b/source/blender/collada/AnimationImporter.h index 54ede656ea7..cc3ffe65735 100644 --- a/source/blender/collada/AnimationImporter.h +++ b/source/blender/collada/AnimationImporter.h @@ -80,12 +80,14 @@ 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 { - NODE_TRANSFORM, - LIGHT_COLOR, - INANIMATE + INANIMATE = 0, + NODE_TRANSFORM = 1, + LIGHT_COLOR = 2, }; public: @@ -108,7 +110,7 @@ public: std::map<COLLADAFW::UniqueId, Object*>& object_map , std::map<COLLADAFW::UniqueId, const COLLADAFW::Object*> FW_object_map); - AnimationType get_animation_type( const COLLADAFW::Node * node , std::map<COLLADAFW::UniqueId,const COLLADAFW::Object*> FW_object_map ) ; + int get_animation_type( const COLLADAFW::Node * node , std::map<COLLADAFW::UniqueId,const COLLADAFW::Object*> FW_object_map ) ; void Assign_transform_animations(COLLADAFW::Transformation* transform , |