Browse Source

Merge pull request #19368 from yothinko/dev

Account for invalid parseAnimationLayers children IDs in FBXLoader
Mr.doob 5 years ago
parent
commit
7d4292cd7e
2 changed files with 8 additions and 0 deletions
  1. 4 0
      examples/js/loaders/FBXLoader.js
  2. 4 0
      examples/jsm/loaders/FBXLoader.js

+ 4 - 0
examples/js/loaders/FBXLoader.js

@@ -2492,6 +2492,10 @@ THREE.FBXLoader = ( function () {
 
 										var rawModel = fbxTree.Objects.Model[ modelID.toString() ];
 
+										if ( rawModel === undefined ) {
+											return;
+										}
+
 										var node = {
 
 											modelName: rawModel.attrName ? THREE.PropertyBinding.sanitizeNodeName( rawModel.attrName ) : '',

+ 4 - 0
examples/jsm/loaders/FBXLoader.js

@@ -2539,6 +2539,10 @@ var FBXLoader = ( function () {
 
 										var rawModel = fbxTree.Objects.Model[ modelID.toString() ];
 
+										if ( rawModel === undefined ) {
+											return;
+										}
+
 										var node = {
 
 											modelName: rawModel.attrName ? PropertyBinding.sanitizeNodeName( rawModel.attrName ) : '',