diff options
| author | Gaia Clary <gaia.clary@machinimatrix.org> | 2013-07-14 21:21:12 +0400 |
|---|---|---|
| committer | Gaia Clary <gaia.clary@machinimatrix.org> | 2013-07-14 21:21:12 +0400 |
| commit | e353593b30092563a2f140a7709bb425cd69fddf (patch) | |
| tree | 2137bdea7357a04eebcb593ca14689bc72da01b8 /source/blender/collada/ArmatureImporter.h | |
| parent | 4507dd9a7e0b1980ac7fb2e0a26a460fd62671e6 (diff) | |
fix: #36060 Collada Import: animated armature+mesh problem
Diffstat (limited to 'source/blender/collada/ArmatureImporter.h')
| -rw-r--r-- | source/blender/collada/ArmatureImporter.h | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/source/blender/collada/ArmatureImporter.h b/source/blender/collada/ArmatureImporter.h index bd17a925f3a..beeac85cc4d 100644 --- a/source/blender/collada/ArmatureImporter.h +++ b/source/blender/collada/ArmatureImporter.h @@ -140,11 +140,7 @@ public: ArmatureImporter(UnitConverter *conv, MeshImporterBase *mesh, Scene *sce); ~ArmatureImporter(); - void add_joint(COLLADAFW::Node *node, bool root, Object *parent); - -#if 0 - void add_root_joint(COLLADAFW::Node *node); -#endif + void add_root_joint(COLLADAFW::Node *node, Object *parent); // here we add bones to armatures, having armatures previously created in write_controller void make_armatures(bContext *C); |