Fix hierarchical submesh processing in the ColladaLoader. (#78)

Fix hierarchical submesh processing in the ColladaLoader. #78 Signed-off-by: Nate Koenig <nate@openrobotics.org>
gazebosim · Jun 16, 2020 · d6f7d2d · d6f7d2d
1 parent 3627f7d
commit d6f7d2d
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 5 deletions.
diff --git a/Changelog.md b/Changelog.md
@@ -2,6 +2,9 @@
 
 ## Ignition Common 3.X.X
 
+1. Fix hierarchical submesh processing in the ColladaLoader.
+    * [Pull Request 78](https://github.com/ignitionrobotics/ign-common/pull/78)
+
 ## Ignition Common 3.6.0 (2020-06-09)
 
 1. Refactor Image::MaxColor to reduce computation time

diff --git a/graphics/src/ColladaLoader.cc b/graphics/src/ColladaLoader.cc
@@ -466,18 +466,18 @@ void ColladaLoaderPrivate::LoadNode(tinyxml2::XMLElement *_elem, Mesh *_mesh,
   ignition::math::Matrix4d transform = this->LoadNodeTransform(_elem);
   transform = _transform * transform;
 
-  if (_elem->Attribute("name"))
-  {
-    this->currentNodeName = _elem->Attribute("name");
-  }
-
   nodeXml = _elem->FirstChildElement("node");
   while (nodeXml)
   {
     this->LoadNode(nodeXml, _mesh, transform);
     nodeXml = nodeXml->NextSiblingElement("node");
   }
 
+  if (_elem->Attribute("name"))
+  {
+    this->currentNodeName = _elem->Attribute("name");
+  }
+
   if (_elem->FirstChildElement("instance_node"))
   {
     std::string nodeURLStr =