提交 fa4bcdac 编写于 作者: M Mr.doob

ObjectLoader: Handle deprecated MultiMaterial. See #11220.

上级 0643a406
......@@ -145,18 +145,6 @@ Object.assign( MaterialLoader.prototype, {
if ( json.gradientMap !== undefined ) material.gradientMap = getTexture( json.gradientMap );
// MultiMaterial
if ( json.materials !== undefined ) {
for ( var i = 0, l = json.materials.length; i < l; i ++ ) {
material.materials.push( this.parse( json.materials[ i ] ) );
}
}
return material;
}
......
......@@ -363,8 +363,27 @@ Object.assign( ObjectLoader.prototype, {
for ( var i = 0, l = json.length; i < l; i ++ ) {
var material = loader.parse( json[ i ] );
materials[ material.uuid ] = material;
var data = json[ i ];
if ( data.type === 'MultiMaterial' ) {
// Deprecated
var array = [];
for ( var j = 0; j < data.materials.length; j ++ ) {
array.push( loader.parse( data.materials[ j ] ) );
}
materials[ data.uuid ] = array;
} else {
materials[ data.uuid ] = loader.parse( data );
}
}
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册