Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGaia Clary <gaia.clary@machinimatrix.org>2013-07-15 15:01:23 +0400
committerGaia Clary <gaia.clary@machinimatrix.org>2013-07-15 15:01:23 +0400
commit61cb92f701deb6af31476f3687207be5d63b1ce2 (patch)
tree81ace0ec1954b59aefe24926e6e75cbcb3caa841
parentbd863ce58d86e30439018a5c376f6b1a1d5ecaa0 (diff)
fix: #36122 Collada import - Keyframes offset after recording and playing
-rw-r--r--source/blender/collada/DocumentImporter.cpp6
1 files changed, 1 insertions, 5 deletions
diff --git a/source/blender/collada/DocumentImporter.cpp b/source/blender/collada/DocumentImporter.cpp
index 60ef69379de..80bde1842dd 100644
--- a/source/blender/collada/DocumentImporter.cpp
+++ b/source/blender/collada/DocumentImporter.cpp
@@ -311,11 +311,6 @@ void DocumentImporter::translate_anim_recursive(COLLADAFW::Node *node, COLLADAFW
#endif
unsigned int i;
-
- //for (i = 0; i < 4; i++)
- // ob =
- anim_importer.translate_Animations(node, root_map, object_map, FW_object_map);
-
if (node->getType() == COLLADAFW::Node::JOINT && par == NULL) {
// For Skeletons without root node we have to simulate the
// root node here and recursively enter the same function
@@ -323,6 +318,7 @@ void DocumentImporter::translate_anim_recursive(COLLADAFW::Node *node, COLLADAFW
translate_anim_recursive(node, node, parob);
}
else {
+ anim_importer.translate_Animations(node, root_map, object_map, FW_object_map);
COLLADAFW::NodePointerArray &children = node->getChildNodes();
for (i = 0; i < children.getCount(); i++) {
translate_anim_recursive(children[i], node, NULL);