gltf import: Don't reparent existing Object3Ds

This makes it possible to set up a custom heirachy before importing a model, and not have it changed.
kythyria · Jul 15, 2022 · f4cce9e · f4cce9e
1 parent ad1e7c7
commit f4cce9e
Showing 1 changed file with 6 additions and 1 deletion.
diff --git a/PD2ModelParser/Importers/GltfImporter.cs b/PD2ModelParser/Importers/GltfImporter.cs
@@ -84,6 +84,8 @@ void ImportNode(GLTF.Node node, DM.Object3D parent)
                 .Where(i => i != null)
                 .FirstOrDefault(i => i.HashName.Hash == hashname.Hash);
 
+            bool shouldSetParent = true;
+
             if (obj == null)
             {
                 /*var extras = node.TryUseExtrasAsDictionary(false);
@@ -136,11 +138,14 @@ void ImportNode(GLTF.Node node, DM.Object3D parent)
                 {
                     throw new Exception("Can't overwrite lights yet.");
                 }
+
+                // Don't re-parent nodes that already exist in the tree
+                shouldSetParent = false;
             }
 
             objectsByNode.Add(node, obj);
 
-            if(parent != null)
+            if(parent != null && shouldSetParent)
             {
                 obj.SetParent(parent);
             }