Merge remote-tracking branch 'nicoraf/master' into dev

68edabb9 · Mr.doob · 21e73321 · 497f491d · 68edabb9
隐藏空白更改
内联并排

Showing with 1 addition and 1 deletion

examples/js/loaders/SceneLoader.js examples/js/loaders/SceneLoader.js +1 -1

未找到文件。
--- a/examples/js/loaders/SceneLoader.js
+++ b/examples/js/loaders/SceneLoader.js
@@ -1064,7 +1064,7 @@ THREE.SceneLoader.prototype = {

 			for ( parID in matJSON.parameters ) {

-				if ( parID === "envMap" || parID === "map" || parID === "lightMap" || parID === "bumpMap" ) {
+				if ( parID === "envMap" || parID === "map" || parID === "lightMap" || parID === "bumpMap" || parID === "alphaMap" ) {

 					matJSON.parameters[ parID ] = result.textures[ matJSON.parameters[ parID ] ];