Browse Source

MaterialLoader: Simplified normalScale parser. See #7459

Mr.doob 9 years ago
parent
commit
27f1f5e244
1 changed files with 5 additions and 8 deletions
  1. 5 8
      src/loaders/MaterialLoader.js

+ 5 - 8
src/loaders/MaterialLoader.js

@@ -99,20 +99,17 @@ THREE.MaterialLoader.prototype = {
 		if ( json.normalMap !== undefined ) material.normalMap = this.getTexture( json.normalMap );
 		if ( json.normalScale )	{
 
-			var jsonValue = json.normalScale,
-				vector = new THREE.Vector2();
+			var normalScale = json.normalScale;
 
-			if ( Array.isArray( jsonValue ) ) {
+			if ( Array.isArray( normalScale ) === false ) {
 
-				vector.fromArray( jsonValue );
+				// Blender exporter used to export a scalar. See #7459
 
-			} else {
-
-				vector.set( jsonValue, jsonValue );
+				normalScale = [ normalScale, normalScale ];
 
 			}
 
-			material.normalScale = vector;
+			material.normalScale.fromArray( normalScale );
 
 		}