Merge remote-tracking branch 'jsermeno/dev' into dev

This commit is contained in:
Mr.doob
2011-09-11 13:49:31 -04:00
+15
View File
@@ -130,6 +130,7 @@ THREE.Object3D.prototype = {
},
remove: function ( object ) {
var scene = this;
var childIndex = this.children.indexOf( object );
@@ -138,6 +139,20 @@ THREE.Object3D.prototype = {
object.parent = undefined;
this.children.splice( childIndex, 1 );
// remove from scene
while ( scene.parent !== undefined ) {
scene = scene.parent;
}
if ( scene !== undefined && scene instanceof THREE.Scene ) {
scene.removeChildRecurse( object );
}
}
},