2
0
Эх сурвалжийг харах

Merge pull request #12648 from looeee/FBXLoader_parseColor_fix

FBXLoader: support for colors specified as single floats.
Mr.doob 7 жил өмнө
parent
commit
a8f1818226

+ 10 - 2
examples/js/loaders/FBXLoader.js

@@ -1589,7 +1589,7 @@
 
 							if ( lightAttribute.Color !== undefined ) {
 
-								color = parseColor( lightAttribute.Color.value );
+								color = parseColor( lightAttribute.Color );
 
 							}
 
@@ -3910,7 +3910,15 @@
 
 	function parseColor( property ) {
 
-		return new THREE.Color().fromArray( property.value );
+		var color = new THREE.Color();
+
+		if ( property.type === 'Color' ) {
+
+			return color.setScalar( property.value );
+
+		}
+
+		return color.fromArray( property.value );
 
 	}