diff options
| author | Sukhitha Prabhath Jayathilake <pr.jayathilake@gmail.com> | 2011-08-17 22:29:01 +0400 |
|---|---|---|
| committer | Sukhitha Prabhath Jayathilake <pr.jayathilake@gmail.com> | 2011-08-17 22:29:01 +0400 |
| commit | e86e922f5b6d7c3784bb6ffb840e08336ff42027 (patch) | |
| tree | 2923acdfe87cafe3dc2c493f3ffdb6a550474f77 /source/blender/collada/AnimationImporter.h | |
| parent | f3c05e8eb267b3c005cf7255b222ed7bf8972744 (diff) | |
Armature importer code cleanup.
Diffstat (limited to 'source/blender/collada/AnimationImporter.h')
| -rw-r--r-- | source/blender/collada/AnimationImporter.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/collada/AnimationImporter.h b/source/blender/collada/AnimationImporter.h index fbb53ceedb6..18303eb2f0b 100644 --- a/source/blender/collada/AnimationImporter.h +++ b/source/blender/collada/AnimationImporter.h @@ -145,7 +145,7 @@ public: virtual void change_eul_to_quat(Object *ob, bAction *act); #endif - void translate_Animations_NEW ( COLLADAFW::Node * Node , + void translate_Animations( 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); @@ -168,7 +168,7 @@ public: // prerequisites: // animlist_map - map animlist id -> animlist // curve_map - map anim id -> curve(s) - Object * translate_animation(COLLADAFW::Node *node, + Object * translate_animation_OLD(COLLADAFW::Node *node, std::map<COLLADAFW::UniqueId, Object*>& object_map, std::map<COLLADAFW::UniqueId, COLLADAFW::Node*>& root_map, COLLADAFW::Transformation::TransformationType tm_type, |