From 6517447625a472505ee88cfd34b7cab433f3c445 Mon Sep 17 00:00:00 2001 From: "Mr.doob" Date: Wed, 28 Oct 2015 20:11:10 -0400 Subject: [PATCH] MaterialLoader: Force add normalScale. See #7461. --- src/loaders/MaterialLoader.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/loaders/MaterialLoader.js b/src/loaders/MaterialLoader.js index 777f4703d7..d9f8635310 100644 --- a/src/loaders/MaterialLoader.js +++ b/src/loaders/MaterialLoader.js @@ -99,7 +99,7 @@ THREE.MaterialLoader.prototype = { if ( json.bumpScale !== undefined ) material.bumpScale = json.bumpScale; if ( json.normalMap !== undefined ) material.normalMap = this.getTexture( json.normalMap ); - if ( json.normalScale ) { + if ( json.normalScale !== undefined ) { var normalScale = json.normalScale; @@ -111,7 +111,7 @@ THREE.MaterialLoader.prototype = { } - material.normalScale.fromArray( normalScale ); + material.normalScale = new THREE.Vector2().fromArray( normalScale ); } -- GitLab