From 3dfd736d456c79d8ab7c517e68e990040555d223 Mon Sep 17 00:00:00 2001 From: Gaia Clary Date: Mon, 11 Feb 2013 20:21:10 +0000 Subject: [PATCH] Fix: Collada Import of armatures only added the root bone --- source/blender/collada/DocumentImporter.cpp | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/source/blender/collada/DocumentImporter.cpp b/source/blender/collada/DocumentImporter.cpp index 88a67eebe9d..52dd587231d 100644 --- a/source/blender/collada/DocumentImporter.cpp +++ b/source/blender/collada/DocumentImporter.cpp @@ -583,11 +583,16 @@ std::vector *DocumentImporter::write_node(COLLADAFW::Node *node, COLLA } // if node has child nodes write them COLLADAFW::NodePointerArray &child_nodes = node->getChildNodes(); + if (objects_done->size() > 0) { ob = *objects_done->begin(); - for (unsigned int i = 0; i < child_nodes.getCount(); i++) { - write_node(child_nodes[i], node, sce, ob, is_library_node); - } + } + else { + ob = NULL; + } + + for (unsigned int i = 0; i < child_nodes.getCount(); i++) { + write_node(child_nodes[i], node, sce, ob, is_library_node); } return objects_done;