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/DocumentImporter.cpp | |
| parent | 4507dd9a7e0b1980ac7fb2e0a26a460fd62671e6 (diff) | |
fix: #36060 Collada Import: animated armature+mesh problem
Diffstat (limited to 'source/blender/collada/DocumentImporter.cpp')
| -rw-r--r-- | source/blender/collada/DocumentImporter.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/source/blender/collada/DocumentImporter.cpp b/source/blender/collada/DocumentImporter.cpp index af1113b337a..60ef69379de 100644 --- a/source/blender/collada/DocumentImporter.cpp +++ b/source/blender/collada/DocumentImporter.cpp @@ -480,7 +480,9 @@ std::vector<Object *> *DocumentImporter::write_node(COLLADAFW::Node *node, COLLA object_map.insert(std::pair<COLLADAFW::UniqueId, Object *>(node->getUniqueId(), par)); node_map[node->getUniqueId()] = node; } - armature_importer.add_joint(node, parent_node == NULL || parent_node->getType() != COLLADAFW::Node::JOINT, par); + if (parent_node == NULL || parent_node->getType() != COLLADAFW::Node::JOINT) { + armature_importer.add_root_joint(node, par); + } if (parent_node == NULL) { // for skeletons without root node all has been done above. |