Skip to content

Commit dbeaa93

Browse files
authored
Merge pull request #20674 from aptray/dev
Update FBXLoader.js
2 parents 60cbc05 + 8f08e4e commit dbeaa93

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

examples/js/loaders/FBXLoader.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -495,7 +495,7 @@ THREE.FBXLoader = ( function () {
495495

496496
parameters.color = new THREE.Color().fromArray( materialNode.Diffuse.value );
497497

498-
} else if ( materialNode.DiffuseColor && materialNode.DiffuseColor.type === 'Color' ) {
498+
} else if ( materialNode.DiffuseColor && (materialNode.DiffuseColor.type === 'Color' || materialNode.DiffuseColor.type === 'ColorRGB') ) {
499499

500500
// The blender exporter exports diffuse here instead of in materialNode.Diffuse
501501
parameters.color = new THREE.Color().fromArray( materialNode.DiffuseColor.value );
@@ -512,7 +512,7 @@ THREE.FBXLoader = ( function () {
512512

513513
parameters.emissive = new THREE.Color().fromArray( materialNode.Emissive.value );
514514

515-
} else if ( materialNode.EmissiveColor && materialNode.EmissiveColor.type === 'Color' ) {
515+
} else if ( materialNode.EmissiveColor && (materialNode.EmissiveColor.type === 'Color' || materialNode.EmissiveColor.type === 'ColorRGB') ) {
516516

517517
// The blender exporter exports emissive color here instead of in materialNode.Emissive
518518
parameters.emissive = new THREE.Color().fromArray( materialNode.EmissiveColor.value );

0 commit comments

Comments
 (0)