toJSON: Moved geometry/material handling to Object3D. Fixes #7262.

src/core/Object3D.js

@@ -630,6 +630,22 @@ THREE.Object3D.prototype = {
 
 		data.matrix = this.matrix.toArray();
 
+		//
+
+		if ( this.geometry && meta.geometries[ this.geometry.uuid ] === undefined ) {
+
+			meta.geometries[ this.geometry.uuid ] = this.geometry.toJSON( meta );
+
+		}
+
+		if ( this.material && meta.materials[ this.material.uuid ] === undefined ) {
+
+			meta.materials[ this.material.uuid ] = this.material.toJSON( meta );
+
+		}
+
+		//
+
 		if ( this.children.length > 0 ) {
 
 			data.children = [];

src/objects/Line.js

@@ -185,20 +185,6 @@ THREE.Line.prototype.toJSON = function ( meta ) {
 
 	var data = THREE.Object3D.prototype.toJSON.call( this, meta );
 
-	// only serialize if not in meta geometries cache
-	if ( meta.geometries[ this.geometry.uuid ] === undefined ) {
-
-		meta.geometries[ this.geometry.uuid ] = this.geometry.toJSON();
-
-	}
-
-	// only serialize if not in meta materials cache
-	if ( meta.materials[ this.material.uuid ] === undefined ) {
-
-		meta.materials[ this.material.uuid ] = this.material.toJSON();
-
-	}
-
 	data.object.geometry = this.geometry.uuid;
 	data.object.material = this.material.uuid;
 

src/objects/Mesh.js

@@ -359,20 +359,6 @@ THREE.Mesh.prototype.toJSON = function ( meta ) {
 
 	var data = THREE.Object3D.prototype.toJSON.call( this, meta );
 
-	// only serialize if not in meta geometries cache
-	if ( meta.geometries[ this.geometry.uuid ] === undefined ) {
-
-		meta.geometries[ this.geometry.uuid ] = this.geometry.toJSON( meta );
-
-	}
-
-	// only serialize if not in meta materials cache
-	if ( meta.materials[ this.material.uuid ] === undefined ) {
-
-		meta.materials[ this.material.uuid ] = this.material.toJSON( meta );
-
-	}
-
 	data.object.geometry = this.geometry.uuid;
 	data.object.material = this.material.uuid;
 

src/objects/Points.js

@@ -130,20 +130,6 @@ THREE.Points.prototype.toJSON = function ( meta ) {
 
 	var data = THREE.Object3D.prototype.toJSON.call( this, meta );
 
-	// only serialize if not in meta geometries cache
-	if ( meta.geometries[ this.geometry.uuid ] === undefined ) {
-
-		meta.geometries[ this.geometry.uuid ] = this.geometry.toJSON();
-
-	}
-
-	// only serialize if not in meta materials cache
-	if ( meta.materials[ this.material.uuid ] === undefined ) {
-
-		meta.materials[ this.material.uuid ] = this.material.toJSON();
-
-	}
-
 	data.object.geometry = this.geometry.uuid;
 	data.object.material = this.material.uuid;
 

src/objects/Sprite.js

@@ -70,13 +70,6 @@ THREE.Sprite.prototype.toJSON = function ( meta ) {
 
 	var data = THREE.Object3D.prototype.toJSON.call( this, meta );
 
-	// only serialize if not in meta materials cache
-	if ( meta.materials[ this.material.uuid ] === undefined ) {
-
-		meta.materials[ this.material.uuid ] = this.material.toJSON();
-
-	}
-
 	data.object.material = this.material.uuid;
 
 	return data;