[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [58264] trunk/blender/source/blender/ collada/DocumentImporter.cpp: fix: #36122 Collada import - Keyframes offset after recording and playing
Gaia Clary
gaia.clary at machinimatrix.org
Mon Jul 15 13:01:23 CEST 2013
Revision: 58264
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=58264
Author: gaiaclary
Date: 2013-07-15 11:01:23 +0000 (Mon, 15 Jul 2013)
Log Message:
-----------
fix: #36122 Collada import - Keyframes offset after recording and playing
Modified Paths:
--------------
trunk/blender/source/blender/collada/DocumentImporter.cpp
Modified: trunk/blender/source/blender/collada/DocumentImporter.cpp
===================================================================
--- trunk/blender/source/blender/collada/DocumentImporter.cpp 2013-07-15 10:50:04 UTC (rev 58263)
+++ trunk/blender/source/blender/collada/DocumentImporter.cpp 2013-07-15 11:01:23 UTC (rev 58264)
@@ -311,11 +311,6 @@
#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 @@
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);
More information about the Bf-blender-cvs
mailing list