Browse Source

MultiMaterial: Robustified toJSON(). See #7415.

Mr.doob 9 years ago
parent
commit
1a582b6bdf
1 changed files with 8 additions and 3 deletions
  1. 8 3
      src/materials/MultiMaterial.js

+ 8 - 3
src/materials/MultiMaterial.js

@@ -18,7 +18,7 @@ THREE.MultiMaterial.prototype = {
 
 	constructor: THREE.MultiMaterial,
 
-	toJSON: function () {
+	toJSON: function ( meta ) {
 
 		var output = {
 			metadata: {
@@ -31,9 +31,14 @@ THREE.MultiMaterial.prototype = {
 			materials: []
 		};
 
-		for ( var i = 0, l = this.materials.length; i < l; i ++ ) {
+		var materials = this.materials;
 
-			output.materials.push( this.materials[ i ].toJSON() );
+		for ( var i = 0, l = materials.length; i < l; i ++ ) {
+
+			var material = materials[ i ].toJSON( meta );
+			delete material.metadata;
+
+			output.materials.push( material );
 
 		}