Merge pull request #5525 from titansoftime/dev

Bringing back functionality from GeometryUtils.merge

src/core/Geometry.js

@@ -557,10 +557,32 @@ THREE.Geometry.prototype = {
 	},
 
 	merge: function ( geometry, matrix, materialIndexOffset ) {
+	
+		console.warn( 'THREE.Geometry.merge() has been renamed to THREE.Geometry.mergeGeometry().' );
+		this.mergeGeometry( geometry, matrix, materialIndexOffset );
+	
+	},
+
+	mergeMesh: function ( mesh ) {
+	
+		if ( mesh instanceof THREE.Mesh === false ) {
+		
+			console.error( 'THREE.Geometry.mergeMesh(): mesh not an instance of THREE.Mesh.', mesh );
+			return;
+		
+		}
+
+		mesh.matrixAutoUpdate && mesh.updateMatrix();
+		
+		this.mergeGeometry( mesh.geometry, mesh.matrix );
+	
+	},
+
+	mergeGeometry: function ( geometry, matrix, materialIndexOffset ) {
 
 		if ( geometry instanceof THREE.Geometry === false ) {
 
-			console.error( 'THREE.Geometry.merge(): geometry not an instance of THREE.Geometry.', geometry );
+			console.error( 'THREE.Geometry.mergeGeometry(): geometry not an instance of THREE.Geometry.', geometry );
 			return;
 
 		}