Browse Source

simplify extend because we don't need it to be hierarchical.

Ben Houston 12 years ago
parent
commit
c2ed32e7fa
1 changed files with 1 additions and 11 deletions
  1. 1 11
      src/Three.js

+ 1 - 11
src/Three.js

@@ -48,19 +48,9 @@ String.prototype.trim = String.prototype.trim || function () {
 // based on http://stackoverflow.com/a/12317051
 // based on http://stackoverflow.com/a/12317051
 THREE.extend = function ( target, other ) {
 THREE.extend = function ( target, other ) {
 
 
-	target = target || {};
-
 	for (var prop in other) {
 	for (var prop in other) {
 
 
-		if ( typeof other[prop] === 'object' ) {
-
-			target[prop] = THREE.extend( target[prop], other[prop] );
-
-		} else {
-
-			target[prop] = other[prop];
-
-		}
+		target[prop] = other[prop];
 
 
 	}
 	}