fix: No errors when importing empty scenes

atteneder · Oct 14, 2021 · a52131b · a52131b
1 parent 4a4c4da
commit a52131b
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 8 deletions.
diff --git a/ChangeLog.md b/ChangeLog.md
@@ -7,6 +7,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ## [Unreleased] - 
 ### Fixed
 - Corrected mesh bounds (calculated from accessor's min/max)
+- No errors when importing empty scenes
 
 ## [4.3.2] - 2020-10-13
 ### Added

diff --git a/Runtime/Scripts/GameObjectInstantiator.cs b/Runtime/Scripts/GameObjectInstantiator.cs
@@ -321,9 +321,11 @@ uint[] nodeIndices
             var go = new GameObject(name ?? "Scene");
             go.transform.SetParent( parent, false);
 
-            foreach(var nodeIndex in nodeIndices) {
-                if (nodes[nodeIndex] != null) {
-                    nodes[nodeIndex].transform.SetParent( go.transform, false );
+            if (nodeIndices != null) {
+                foreach(var nodeIndex in nodeIndices) {
+                    if (nodes[nodeIndex] != null) {
+                        nodes[nodeIndex].transform.SetParent( go.transform, false );
+                    }
                 }
             }
 

diff --git a/Runtime/Scripts/GltfImport.cs b/Runtime/Scripts/GltfImport.cs
@@ -1588,13 +1588,16 @@ void PopulateHierarchy(uint nodeIndex, uint? parentIndex) {
 
             var scene = gltfRoot.scenes[sceneId];
             instantiator.Init();
+
+            if (scene.nodes != null) {
+                foreach (var nodeId in scene.nodes) {
+                    IterateNodes(nodeId,null,CreateHierarchy);
+                }
 
-            foreach (var nodeId in scene.nodes) {
-                IterateNodes(nodeId,null,CreateHierarchy);
-            }
 
-            foreach (var nodeId in scene.nodes) {
-                IterateNodes(nodeId,null,PopulateHierarchy);
+                foreach (var nodeId in scene.nodes) {
+                    IterateNodes(nodeId,null,PopulateHierarchy);
+                }
             }
 
 #if UNITY_ANIMATION