Merge branch 'x3dom:master' into master

andreasplesch · Nov 29, 2023 · 15a7c9e · 15a7c9e
2 parents 0dc808a + a0601f8
commit 15a7c9e
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -13,6 +13,7 @@
     * MSFT_texture_dds
   * field values from metadata for non-standard nodes
 * Improvements
+  * allow null value for glTF.scene.nodes
   * improved fog over shadows ([dmorehead](https://github.com/dmorehead))
   * enable negative scale auto-ccw for BufferGeometry/glTF
   * enable shadows for BufferGeometry/glTF

diff --git a/src/util/glTF/glTF2Loader.js b/src/util/glTF/glTF2Loader.js
@@ -57,7 +57,7 @@ x3dom.glTF2Loader.prototype.load = function ( input, binary )
         }
 
         // Get the nodes
-        for ( var i = 0; i < scene.nodes.length; i++ )
+        for ( var i = 0; i < ( scene.nodes ? scene.nodes.length : 0 ); i++ )
         {
             var node = this._gltf.nodes[ scene.nodes[ i ] ];