SceneLoader2/SceneExporter2: Material format tweaks.

examples/js/exporters/SceneExporter2.js

@@ -111,6 +111,8 @@ THREE.SceneExporter2.prototype = {
 					data.type = 'Geometry';
 					data.data = geometryExporter.parse( geometry );
 
+					delete data.data.metadata;
+
 				}
 
 				output.geometries.push( data );
@@ -138,10 +140,11 @@ THREE.SceneExporter2.prototype = {
 
 				materials[ material.id ] = output.materials.length;
 
-				var data = {};
+				var data = materialExporter.parse( material );
 
 				if ( material.name !== "" ) data.name = material.name;
-				data.data = materialExporter.parse( material );
+
+				delete data.metadata;
 
 				output.materials.push( data );
 
@@ -241,8 +244,6 @@ THREE.SceneExporter2.prototype = {
 
 			}
 
-			// parse children
-
 			if ( object.children.length > 0 ) {
 
 				data.children = [];

examples/js/loaders/SceneLoader2.js

@@ -163,7 +163,7 @@ THREE.SceneLoader2.prototype = {
 		for ( var i = 0, l = json.materials.length; i < l; i ++ ) {
 
 			var data = json.materials[ i ];
-			var material = loader.parse( data.data );
+			var material = loader.parse( data );
 
 			if ( data.name !== undefined ) material.name = data.name;