瀏覽代碼

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

Mr.doob 14 年之前
父節點
當前提交
7c20f3f99a
共有 1 個文件被更改,包括 15 次插入0 次删除
  1. 15 0
      src/core/Object3D.js

+ 15 - 0
src/core/Object3D.js

@@ -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 );
+
+			}
+
 		}
 
 	},