[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [54474] trunk/blender/source/blender/ collada/DocumentImporter.cpp: Fix: Collada Import of armatures only added the root bone

[Gaia Clary]

Revision: 54474
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=54474
Author:   gaiaclary
Date:     2013-02-11 20:21:10 +0000 (Mon, 11 Feb 2013)
Log Message:
-----------
Fix: Collada Import of armatures only added the root bone

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-02-11 18:47:06 UTC (rev 54473)
+++ trunk/blender/source/blender/collada/DocumentImporter.cpp	2013-02-11 20:21:10 UTC (rev 54474)
@@ -583,13 +583,18 @@
 	}
 	// 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;
 }