Merge branch 'main' into Helios_DataDrivenAssetImporter

2021-05-17 11:00:41 -05:00
parent ee4e9af465 749ffcfff2
commit f5fab7e974
590 changed files with 6455 additions and 44343 deletions
@@ -139,6 +139,8 @@ namespace AZ
                    if (!nodeNameMap.RegisterNode(node.m_node, scene.GetGraph(), node.m_parent))
                    {
                        AZ_TracePrintf(Utilities::ErrorWindow, "Failed to register asset importer node in name table.");
+                        // Skip this node since it could not be registered
+                        nodes.pop();
                        continue;
                    }
                    AZStd::string nodeName = nodeNameMap.GetNodeName(node.m_node);