SceneMainLoop -> SceneTree

-=-=-=-=-=-=-=-=-=-=-=-=-=-

*YOUR SOURCE MIGHT NOT WORK*
For mor information on fix:
https://github.com/okamstudio/godot/wiki/devel_scene_tree

Other stuff:
-Shower of bullets demo
-Fixes all around

26 files changed, 147 insertions, 147 deletions

diff --git a/scene/2d/area_2d.cpp b/scene/2d/area_2d.cpp
index ad228662e4..48fa74cc6d 100644
--- a/scene/2d/area_2d.cpp
+++ b/scene/2d/area_2d.cpp
@@ -94,7 +94,7 @@ real_t Area2D::get_priority() const{
 }
 
 
-void Area2D::_body_enter_scene(ObjectID p_id) {
+void Area2D::_body_enter_tree(ObjectID p_id) {
 
 	Object *obj = ObjectDB::get_instance(p_id);
 	Node *node = obj ? obj->cast_to<Node>() : NULL;
@@ -102,9 +102,9 @@ void Area2D::_body_enter_scene(ObjectID p_id) {
 
 	Map<ObjectID,BodyState>::Element *E=body_map.find(p_id);
 	ERR_FAIL_COND(!E);
-	ERR_FAIL_COND(E->get().in_scene);
+	ERR_FAIL_COND(E->get().in_tree);
 
-	E->get().in_scene=true;
+	E->get().in_tree=true;
 	emit_signal(SceneStringNames::get_singleton()->body_enter,node);
 	for(int i=0;i<E->get().shapes.size();i++) {
 
@@ -113,15 +113,15 @@ void Area2D::_body_enter_scene(ObjectID p_id) {
 
 }
 
-void Area2D::_body_exit_scene(ObjectID p_id) {
+void Area2D::_body_exit_tree(ObjectID p_id) {
 
 	Object *obj = ObjectDB::get_instance(p_id);
 	Node *node = obj ? obj->cast_to<Node>() : NULL;
 	ERR_FAIL_COND(!node);
 	Map<ObjectID,BodyState>::Element *E=body_map.find(p_id);
 	ERR_FAIL_COND(!E);
-	ERR_FAIL_COND(!E->get().in_scene);
-	E->get().in_scene=false;
+	ERR_FAIL_COND(!E->get().in_tree);
+	E->get().in_tree=false;
 	emit_signal(SceneStringNames::get_singleton()->body_exit,node);
 	for(int i=0;i<E->get().shapes.size();i++) {
 
@@ -147,11 +147,11 @@ void Area2D::_body_inout(int p_status,const RID& p_body, int p_instance, int p_b
 
 			E = body_map.insert(objid,BodyState());
 			E->get().rc=0;
-			E->get().in_scene=node && node->is_inside_scene();
+			E->get().in_tree=node && node->is_inside_tree();
 			if (node) {
-				node->connect(SceneStringNames::get_singleton()->enter_scene,this,SceneStringNames::get_singleton()->_body_enter_scene,make_binds(objid));
-				node->connect(SceneStringNames::get_singleton()->exit_scene,this,SceneStringNames::get_singleton()->_body_exit_scene,make_binds(objid));
-				if (E->get().in_scene) {
+				node->connect(SceneStringNames::get_singleton()->enter_tree,this,SceneStringNames::get_singleton()->_body_enter_tree,make_binds(objid));
+				node->connect(SceneStringNames::get_singleton()->exit_tree,this,SceneStringNames::get_singleton()->_body_exit_tree,make_binds(objid));
+				if (E->get().in_tree) {
 					emit_signal(SceneStringNames::get_singleton()->body_enter,node);
 				}
 			}
@@ -162,7 +162,7 @@ void Area2D::_body_inout(int p_status,const RID& p_body, int p_instance, int p_b
 			E->get().shapes.insert(ShapePair(p_body_shape,p_area_shape));
 
 
-		if (E->get().in_scene) {
+		if (E->get().in_tree) {
 			emit_signal(SceneStringNames::get_singleton()->body_enter_shape,objid,node,p_body_shape,p_area_shape);
 		}
 
@@ -178,9 +178,9 @@ void Area2D::_body_inout(int p_status,const RID& p_body, int p_instance, int p_b
 		if (E->get().rc==0) {
 
 			if (node) {
-				node->disconnect(SceneStringNames::get_singleton()->enter_scene,this,SceneStringNames::get_singleton()->_body_enter_scene);
-				node->disconnect(SceneStringNames::get_singleton()->exit_scene,this,SceneStringNames::get_singleton()->_body_exit_scene);
-				if (E->get().in_scene)
+				node->disconnect(SceneStringNames::get_singleton()->enter_tree,this,SceneStringNames::get_singleton()->_body_enter_tree);
+				node->disconnect(SceneStringNames::get_singleton()->exit_tree,this,SceneStringNames::get_singleton()->_body_exit_tree);
+				if (E->get().in_tree)
 					emit_signal(SceneStringNames::get_singleton()->body_exit,obj);
 
 			}
@@ -188,7 +188,7 @@ void Area2D::_body_inout(int p_status,const RID& p_body, int p_instance, int p_b
 			eraseit=true;
 
 		}
-		if (node && E->get().in_scene) {
+		if (node && E->get().in_tree) {
 			emit_signal(SceneStringNames::get_singleton()->body_exit_shape,objid,obj,p_body_shape,p_area_shape);
 		}
 
@@ -212,7 +212,7 @@ void Area2D::_clear_monitoring() {
 		Object *obj = ObjectDB::get_instance(E->key());
 		Node *node = obj ? obj->cast_to<Node>() : NULL;
 		ERR_CONTINUE(!node);
-		if (!E->get().in_scene)
+		if (!E->get().in_tree)
 			continue;
 
 		for(int i=0;i<E->get().shapes.size();i++) {
@@ -222,8 +222,8 @@ void Area2D::_clear_monitoring() {
 
 		emit_signal(SceneStringNames::get_singleton()->body_exit,obj);
 
-		node->disconnect(SceneStringNames::get_singleton()->enter_scene,this,SceneStringNames::get_singleton()->_body_enter_scene);
-		node->disconnect(SceneStringNames::get_singleton()->exit_scene,this,SceneStringNames::get_singleton()->_body_exit_scene);
+		node->disconnect(SceneStringNames::get_singleton()->enter_tree,this,SceneStringNames::get_singleton()->_body_enter_tree);
+		node->disconnect(SceneStringNames::get_singleton()->exit_tree,this,SceneStringNames::get_singleton()->_body_exit_tree);
 	}
 
 }
@@ -232,7 +232,7 @@ void Area2D::_notification(int p_what) {
 
 	switch(p_what) {
 
-		case NOTIFICATION_EXIT_SCENE: {
+		case NOTIFICATION_EXIT_TREE: {
 
 			_clear_monitoring();
 		} break;
@@ -266,8 +266,8 @@ bool Area2D::is_monitoring_enabled() const {
 
 void Area2D::_bind_methods() {
 
-	ObjectTypeDB::bind_method(_MD("_body_enter_scene","id"),&Area2D::_body_enter_scene);
-	ObjectTypeDB::bind_method(_MD("_body_exit_scene","id"),&Area2D::_body_exit_scene);
+	ObjectTypeDB::bind_method(_MD("_body_enter_tree","id"),&Area2D::_body_enter_tree);
+	ObjectTypeDB::bind_method(_MD("_body_exit_tree","id"),&Area2D::_body_exit_tree);
 
 	ObjectTypeDB::bind_method(_MD("set_space_override_mode","enable"),&Area2D::set_space_override_mode);
 	ObjectTypeDB::bind_method(_MD("get_space_override_mode"),&Area2D::get_space_override_mode);
diff --git a/scene/2d/area_2d.h b/scene/2d/area_2d.h
index b4c8edf138..85f2b91582 100644
--- a/scene/2d/area_2d.h
+++ b/scene/2d/area_2d.h
@@ -55,8 +55,8 @@ private:
 
 	void _body_inout(int p_status,const RID& p_body, int p_instance, int p_body_shape,int p_area_shape);
 
-	void _body_enter_scene(ObjectID p_id);
-	void _body_exit_scene(ObjectID p_id);
+	void _body_enter_tree(ObjectID p_id);
+	void _body_exit_tree(ObjectID p_id);
 
 	struct ShapePair {
 
@@ -76,7 +76,7 @@ private:
 	struct BodyState {
 
 		int rc;
-		bool in_scene;
+		bool in_tree;
 		VSet<ShapePair> shapes;
 	};
 
diff --git a/scene/2d/camera_2d.cpp b/scene/2d/camera_2d.cpp
index fe6c9637e0..b3897010bf 100644
--- a/scene/2d/camera_2d.cpp
+++ b/scene/2d/camera_2d.cpp
@@ -33,10 +33,10 @@
 void Camera2D::_update_scroll() {
 
 
-	if (!is_inside_scene())
+	if (!is_inside_tree())
 		return;
 
-	if (get_scene()->is_editor_hint()) {
+	if (get_tree()->is_editor_hint()) {
 		update(); //will just be drawn
 		return;
 	}
@@ -48,7 +48,7 @@ void Camera2D::_update_scroll() {
 		if (viewport) {
 		       viewport->set_canvas_transform( xform );
 		}
-		get_scene()->call_group(SceneMainLoop::GROUP_CALL_REALTIME,group_name,"_camera_moved",xform);
+		get_tree()->call_group(SceneTree::GROUP_CALL_REALTIME,group_name,"_camera_moved",xform);
 	};
 
 }
@@ -67,7 +67,7 @@ Vector2 Camera2D::get_zoom() const {
 
 Matrix32 Camera2D::get_camera_transform()  {
 
-	if (!get_scene())
+	if (!get_tree())
 		return Matrix32();
 
 	Size2 screen_size = get_viewport_rect().size;
@@ -213,7 +213,7 @@ void Camera2D::_notification(int p_what) {
 				_update_scroll();
 
 		} break;
-		case NOTIFICATION_ENTER_SCENE: {
+		case NOTIFICATION_ENTER_TREE: {
 
 			viewport = NULL;
 			Node *n=this;
@@ -239,7 +239,7 @@ void Camera2D::_notification(int p_what) {
 
 
 		} break;
-		case NOTIFICATION_EXIT_SCENE: {
+		case NOTIFICATION_EXIT_TREE: {
 
 			if (is_current()) {
 				if (viewport) {
@@ -316,10 +316,10 @@ bool Camera2D::is_current() const {
 
 void Camera2D::make_current() {
 
-	if (!is_inside_scene()) {
+	if (!is_inside_tree()) {
 		current=true;
 	} else {
-		get_scene()->call_group(SceneMainLoop::GROUP_CALL_REALTIME,group_name,"_make_current",this);
+		get_tree()->call_group(SceneTree::GROUP_CALL_REALTIME,group_name,"_make_current",this);
 	}
 }
 
diff --git a/scene/2d/canvas_item.cpp b/scene/2d/canvas_item.cpp
index d66f100b3f..f90da51eea 100644
--- a/scene/2d/canvas_item.cpp
+++ b/scene/2d/canvas_item.cpp
@@ -38,7 +38,7 @@
 
 bool CanvasItem::is_visible() const {
 
-	if (!is_inside_scene())
+	if (!is_inside_tree())
 		return false;
 
 	const CanvasItem *p=this;
@@ -92,7 +92,7 @@ void CanvasItem::show() {
 	hidden=false;
 	VisualServer::get_singleton()->canvas_item_set_visible(canvas_item,true);
 
-	if (!is_inside_scene())
+	if (!is_inside_tree())
 		return;
 
 	if (is_visible()) {
@@ -106,11 +106,11 @@ void CanvasItem::hide() {
 	if (hidden)
 		return;
 
-	bool propagate=is_inside_scene() && is_visible();
+	bool propagate=is_inside_tree() && is_visible();
 	hidden=true;
 	VisualServer::get_singleton()->canvas_item_set_visible(canvas_item,false);
 
-	if (!is_inside_scene())
+	if (!is_inside_tree())
 		return;
 	if (propagate)
 		_propagate_visibility_changed(false);
@@ -147,7 +147,7 @@ void CanvasItem::_update_callback() {
 
 
 
-	if (!is_inside_scene()) {
+	if (!is_inside_tree()) {
 		pending_update=false;
 		return;
 	}
@@ -225,7 +225,7 @@ void CanvasItem::_sort_children() {
 
 	pending_children_sort=false;
 
-	if (!is_inside_scene())
+	if (!is_inside_tree())
 		return;
 
 	for(int i=0;i<get_child_count();i++) {
@@ -243,7 +243,7 @@ void CanvasItem::_sort_children() {
 
 void CanvasItem::_raise_self() {
 
-	if (!is_inside_scene())
+	if (!is_inside_tree())
 		return;
 
 	VisualServer::get_singleton()->canvas_item_raise(canvas_item);
@@ -283,7 +283,7 @@ void CanvasItem::_enter_canvas() {
 		group = "root_canvas"+itos(canvas.get_id());
 
 		add_to_group(group);
-		get_scene()->call_group(SceneMainLoop::GROUP_CALL_UNIQUE,group,"_raise_self");
+		get_tree()->call_group(SceneTree::GROUP_CALL_UNIQUE,group,"_raise_self");
 
 	} else {
 
@@ -313,7 +313,7 @@ void CanvasItem::_notification(int p_what) {
 
 
 	switch(p_what) {
-		case NOTIFICATION_ENTER_SCENE: {
+		case NOTIFICATION_ENTER_TREE: {
 
 			first_draw=true;
 			pending_children_sort=false;
@@ -324,14 +324,14 @@ void CanvasItem::_notification(int p_what) {
 			}
 			_enter_canvas();
 			if (!block_transform_notify && !xform_change.in_list()) {
-				get_scene()->xform_change_list.add(&xform_change);
+				get_tree()->xform_change_list.add(&xform_change);
 			}
 		} break;
 		case NOTIFICATION_MOVED_IN_PARENT: {
 
 
 			if (group!="") {
-				get_scene()->call_group(SceneMainLoop::GROUP_CALL_UNIQUE,group,"_raise_self");
+				get_tree()->call_group(SceneTree::GROUP_CALL_UNIQUE,group,"_raise_self");
 			} else {
 				CanvasItem *p = get_parent_item();
 				ERR_FAIL_COND(!p);
@@ -340,9 +340,9 @@ void CanvasItem::_notification(int p_what) {
 
 
 		} break;
-		case NOTIFICATION_EXIT_SCENE: {
+		case NOTIFICATION_EXIT_TREE: {
 			if (xform_change.in_list())
-				get_scene()->xform_change_list.remove(&xform_change);
+				get_tree()->xform_change_list.remove(&xform_change);
 			_exit_canvas();
 			if (C) {
 				get_parent()->cast_to<CanvasItem>()->children_items.erase(C);
@@ -379,7 +379,7 @@ bool CanvasItem::_is_visible_() const {
 
 void CanvasItem::update() {
 
-	if (!is_inside_scene())
+	if (!is_inside_tree())
 		return;
 	if (pending_update)
 		return;
@@ -406,7 +406,7 @@ void CanvasItem::set_as_toplevel(bool p_toplevel) {
 	if (toplevel==p_toplevel)
 		return;
 
-	if (!is_inside_scene()) {
+	if (!is_inside_tree()) {
 		toplevel=p_toplevel;
 		return;
 	}
@@ -630,8 +630,8 @@ void CanvasItem::_notify_transform(CanvasItem *p_node) {
 
 	if (!p_node->xform_change.in_list()) {
 		if (!p_node->block_transform_notify) {
-			if (p_node->is_inside_scene())
-				get_scene()->xform_change_list.add(&p_node->xform_change);
+			if (p_node->is_inside_tree())
+				get_tree()->xform_change_list.add(&p_node->xform_change);
 		}
 	}
 
@@ -648,13 +648,13 @@ void CanvasItem::_notify_transform(CanvasItem *p_node) {
 
 Rect2 CanvasItem::get_viewport_rect() const {
 
-	ERR_FAIL_COND_V(!is_inside_scene(),Rect2());
+	ERR_FAIL_COND_V(!is_inside_tree(),Rect2());
 	return get_viewport()->get_visible_rect();
 }
 
 RID CanvasItem::get_canvas() const {
 
-	ERR_FAIL_COND_V(!is_inside_scene(),RID());
+	ERR_FAIL_COND_V(!is_inside_tree(),RID());
 
 	if (canvas_layer)
 		return canvas_layer->get_world_2d()->get_canvas();
@@ -677,7 +677,7 @@ CanvasItem *CanvasItem::get_toplevel() const {
 
 Ref<World2D> CanvasItem::get_world_2d() const {
 
-	ERR_FAIL_COND_V(!is_inside_scene(),Ref<World2D>());
+	ERR_FAIL_COND_V(!is_inside_tree(),Ref<World2D>());
 
 	CanvasItem *tl=get_toplevel();
 
@@ -693,7 +693,7 @@ Ref<World2D> CanvasItem::get_world_2d() const {
 
 RID CanvasItem::get_viewport_rid() const {
 
-	ERR_FAIL_COND_V(!is_inside_scene(),RID());
+	ERR_FAIL_COND_V(!is_inside_tree(),RID());
 	return get_viewport()->get_viewport();
 }
 
@@ -824,7 +824,7 @@ void CanvasItem::_bind_methods() {
 
 Matrix32 CanvasItem::get_canvas_transform() const {
 
-	ERR_FAIL_COND_V(!is_inside_scene(),Matrix32());
+	ERR_FAIL_COND_V(!is_inside_tree(),Matrix32());
 
 	if (canvas_layer)
 		return canvas_layer->get_transform();
@@ -835,7 +835,7 @@ Matrix32 CanvasItem::get_canvas_transform() const {
 
 Matrix32 CanvasItem::get_viewport_transform() const {
 
-	ERR_FAIL_COND_V(!is_inside_scene(),Matrix32());
+	ERR_FAIL_COND_V(!is_inside_tree(),Matrix32());
 
 	if (canvas_layer) {
 
diff --git a/scene/2d/canvas_item.h b/scene/2d/canvas_item.h
index 604eef0527..dbf8fd79e9 100644
--- a/scene/2d/canvas_item.h
+++ b/scene/2d/canvas_item.h
@@ -110,7 +110,7 @@ protected:
 
 
 
-	_FORCE_INLINE_ void _notify_transform() { if (!is_inside_scene()) return; _notify_transform(this); if (!block_transform_notify) notification(NOTIFICATION_LOCAL_TRANSFORM_CHANGED); }
+	_FORCE_INLINE_ void _notify_transform() { if (!is_inside_tree()) return; _notify_transform(this); if (!block_transform_notify) notification(NOTIFICATION_LOCAL_TRANSFORM_CHANGED); }
 
 	void item_rect_changed();
 
@@ -120,7 +120,7 @@ public:
 
 
 	enum {
-		NOTIFICATION_TRANSFORM_CHANGED=SceneMainLoop::NOTIFICATION_TRANSFORM_CHANGED, //unique
+		NOTIFICATION_TRANSFORM_CHANGED=SceneTree::NOTIFICATION_TRANSFORM_CHANGED, //unique
 		NOTIFICATION_DRAW=30,
 		NOTIFICATION_VISIBILITY_CHANGED=31,
 		NOTIFICATION_ENTER_CANVAS=32,
diff --git a/scene/2d/collision_object_2d.cpp b/scene/2d/collision_object_2d.cpp
index 56359e6015..3b859d9366 100644
--- a/scene/2d/collision_object_2d.cpp
+++ b/scene/2d/collision_object_2d.cpp
@@ -45,7 +45,7 @@ void CollisionObject2D::_notification(int p_what) {
 
 	switch(p_what) {
 
-		case NOTIFICATION_ENTER_SCENE: {
+		case NOTIFICATION_ENTER_TREE: {
 
 			if (area)
 				Physics2DServer::get_singleton()->area_set_transform(rid,get_global_transform());
@@ -69,7 +69,7 @@ void CollisionObject2D::_notification(int p_what) {
 				Physics2DServer::get_singleton()->body_set_state(rid,Physics2DServer::BODY_STATE_TRANSFORM,get_global_transform());
 
 		} break;
-		case NOTIFICATION_EXIT_SCENE: {
+		case NOTIFICATION_EXIT_TREE: {
 
 			if (area) {
 				Physics2DServer::get_singleton()->area_set_space(rid,RID());
diff --git a/scene/2d/collision_polygon_2d.cpp b/scene/2d/collision_polygon_2d.cpp
index ef63286697..57495b5cb0 100644
--- a/scene/2d/collision_polygon_2d.cpp
+++ b/scene/2d/collision_polygon_2d.cpp
@@ -95,7 +95,7 @@ void CollisionPolygon2D::_notification(int p_what) {
 	switch(p_what) {
 		case NOTIFICATION_LOCAL_TRANSFORM_CHANGED: {
 
-			if (!is_inside_scene())
+			if (!is_inside_tree())
 				break;
 			_update_parent();
 
diff --git a/scene/2d/collision_shape_2d.cpp b/scene/2d/collision_shape_2d.cpp
index 3f068f4ccc..9f35ade322 100644
--- a/scene/2d/collision_shape_2d.cpp
+++ b/scene/2d/collision_shape_2d.cpp
@@ -72,12 +72,12 @@ void CollisionShape2D::_notification(int p_what) {
 
 	switch(p_what) {
 
-		case NOTIFICATION_ENTER_SCENE: {
+		case NOTIFICATION_ENTER_TREE: {
 			unparenting=false;
 		} break;
 		case NOTIFICATION_LOCAL_TRANSFORM_CHANGED: {
 
-			if (!is_inside_scene())
+			if (!is_inside_tree())
 				break;
 			_update_parent();
 
diff --git a/scene/2d/joints_2d.cpp b/scene/2d/joints_2d.cpp
index 0e673ff791..e706ad658a 100644
--- a/scene/2d/joints_2d.cpp
+++ b/scene/2d/joints_2d.cpp
@@ -32,7 +32,7 @@
 
 void Joint2D::_update_joint() {
 
-	if (!is_inside_scene())
+	if (!is_inside_tree())
 		return;
 
 	if (joint.is_valid()) {
@@ -86,7 +86,7 @@ void Joint2D::_notification(int p_what) {
 		case NOTIFICATION_READY: {
 			_update_joint();
 		} break;
-		case NOTIFICATION_EXIT_SCENE: {
+		case NOTIFICATION_EXIT_TREE: {
 			if (joint.is_valid()) {
 
 				Physics2DServer::get_singleton()->free(joint);
@@ -145,7 +145,7 @@ void PinJoint2D::_notification(int p_what) {
 
 	switch(p_what) {
 		case NOTIFICATION_DRAW: {
-			if (is_inside_scene() && get_scene()->is_editor_hint()) {
+			if (is_inside_tree() && get_tree()->is_editor_hint()) {
 
 				draw_line(Point2(-10,0),Point2(+10,0),Color(0.7,0.6,0.0,0.5),3);
 				draw_line(Point2(0,-10),Point2(0,+10),Color(0.7,0.6,0.0,0.5),3);
@@ -197,7 +197,7 @@ void GrooveJoint2D::_notification(int p_what) {
 
 	switch(p_what) {
 		case NOTIFICATION_DRAW: {
-			if (is_inside_scene() && get_scene()->is_editor_hint()) {
+			if (is_inside_tree() && get_tree()->is_editor_hint()) {
 
 				draw_line(Point2(-10,0),Point2(+10,0),Color(0.7,0.6,0.0,0.5),3);
 				draw_line(Point2(-10,length),Point2(+10,length),Color(0.7,0.6,0.0,0.5),3);
@@ -291,7 +291,7 @@ void DampedSpringJoint2D::_notification(int p_what) {
 
 	switch(p_what) {
 		case NOTIFICATION_DRAW: {
-			if (is_inside_scene() && get_scene()->is_editor_hint()) {
+			if (is_inside_tree() && get_tree()->is_editor_hint()) {
 
 				draw_line(Point2(-10,0),Point2(+10,0),Color(0.7,0.6,0.0,0.5),3);
 				draw_line(Point2(-10,length),Point2(+10,length),Color(0.7,0.6,0.0,0.5),3);
diff --git a/scene/2d/node_2d.cpp b/scene/2d/node_2d.cpp
index 4c00db2429..6dcee3458f 100644
--- a/scene/2d/node_2d.cpp
+++ b/scene/2d/node_2d.cpp
@@ -130,7 +130,7 @@ void Node2D::_update_transform() {
 
 	VisualServer::get_singleton()->canvas_item_set_transform(get_canvas_item(),_mat);
 
-	if (!is_inside_scene())
+	if (!is_inside_tree())
 		return;
 
 
@@ -272,7 +272,7 @@ void Node2D::set_transform(const Matrix32& p_transform) {
 
 	VisualServer::get_singleton()->canvas_item_set_transform(get_canvas_item(),_mat);
 
-	if (!is_inside_scene())
+	if (!is_inside_tree())
 		return;
 
 	_notify_transform();
diff --git a/scene/2d/parallax_background.cpp b/scene/2d/parallax_background.cpp
index 55607bd4eb..df37285f9d 100644
--- a/scene/2d/parallax_background.cpp
+++ b/scene/2d/parallax_background.cpp
@@ -36,13 +36,13 @@ void ParallaxBackground::_notification(int p_what) {
 	switch(p_what) {
 
 
-		case NOTIFICATION_ENTER_SCENE: {
+		case NOTIFICATION_ENTER_TREE: {
 
 			group_name = "__cameras_"+itos(get_viewport().get_id());
 			add_to_group(group_name);
 
 		} break;
-		case NOTIFICATION_EXIT_SCENE: {
+		case NOTIFICATION_EXIT_TREE: {
 
 			remove_from_group(group_name);
 		} break;
@@ -78,7 +78,7 @@ void ParallaxBackground::set_scroll_offset(const Point2& p_ofs) {
 
 void ParallaxBackground::_update_scroll() {
 
-	if (!is_inside_scene())
+	if (!is_inside_tree())
 		return;
 
 	Vector2 ofs = base_offset+offset*base_scale;
diff --git a/scene/2d/parallax_layer.cpp b/scene/2d/parallax_layer.cpp
index 2cda51dccb..a0913ab50c 100644
--- a/scene/2d/parallax_layer.cpp
+++ b/scene/2d/parallax_layer.cpp
@@ -74,7 +74,7 @@ void ParallaxLayer::_notification(int p_what) {
 
 	switch(p_what) {
 
-		case NOTIFICATION_ENTER_SCENE: {
+		case NOTIFICATION_ENTER_TREE: {
 
 			orig_offset=get_pos();
 			orig_scale=get_scale();
@@ -85,9 +85,9 @@ void ParallaxLayer::_notification(int p_what) {
 
 void ParallaxLayer::set_base_offset_and_scale(const Point2& p_offset,float p_scale) {
 
-	if (!is_inside_scene())
+	if (!is_inside_tree())
 		return;
-	if (get_scene()->is_editor_hint())
+	if (get_tree()->is_editor_hint())
 		return;
 	Point2 new_ofs = ((orig_offset+p_offset)*motion_scale)*p_scale;
 
diff --git a/scene/2d/particles_2d.cpp b/scene/2d/particles_2d.cpp
index 819b06e095..7f492e743c 100644
--- a/scene/2d/particles_2d.cpp
+++ b/scene/2d/particles_2d.cpp
@@ -34,14 +34,14 @@ void ParticleAttractor2D::_notification(int p_what) {
 
 	switch(p_what)	 {
 
-		case NOTIFICATION_ENTER_SCENE: {
+		case NOTIFICATION_ENTER_TREE: {
 
 			_update_owner();
 
 		} break;
 		case NOTIFICATION_DRAW: {
 
-			if (!get_scene()->is_editor_hint())
+			if (!get_tree()->is_editor_hint())
 				return;
 
 			Vector2 pv;
@@ -58,7 +58,7 @@ void ParticleAttractor2D::_notification(int p_what) {
 			}
 
 		} break;
-		case NOTIFICATION_EXIT_SCENE: {
+		case NOTIFICATION_EXIT_TREE: {
 			if (owner) {
 				_set_owner(NULL);
 			}
@@ -76,7 +76,7 @@ void ParticleAttractor2D::_owner_exited() {
 
 void ParticleAttractor2D::_update_owner() {
 
-	if (!is_inside_scene() || !has_node(path)) {
+	if (!is_inside_tree() || !has_node(path)) {
 		_set_owner(NULL);
 		return;
 	}
@@ -98,7 +98,7 @@ void ParticleAttractor2D::_set_owner(Particles2D* p_owner) {
 		return;
 
 	if (owner) {
-		owner->disconnect("exit_scene",this,"_owner_exited");
+		owner->disconnect("exit_tree",this,"_owner_exited");
 		owner->attractors.erase(this);
 		owner=NULL;
 	}
@@ -106,7 +106,7 @@ void ParticleAttractor2D::_set_owner(Particles2D* p_owner) {
 
 	if (owner) {
 
-		owner->connect("exit_scene",this,"_owner_exited",varray(),CONNECT_ONESHOT);
+		owner->connect("exit_tree",this,"_owner_exited",varray(),CONNECT_ONESHOT);
 		owner->attractors.insert(this);
 	}
 }
@@ -457,7 +457,7 @@ void Particles2D::_notification(int p_what) {
 			_process_particles( get_process_delta_time() );
 		} break;
 
-		case NOTIFICATION_ENTER_SCENE: {
+		case NOTIFICATION_ENTER_TREE: {
 
 			float ppt=preprocess;
 			while(ppt>0) {
diff --git a/scene/2d/path_2d.cpp b/scene/2d/path_2d.cpp
index febec54124..5560274c98 100644
--- a/scene/2d/path_2d.cpp
+++ b/scene/2d/path_2d.cpp
@@ -31,7 +31,7 @@
 
 void Path2D::_notification(int p_what) {
 
-	if (p_what==NOTIFICATION_DRAW && curve.is_valid() && is_inside_scene() && get_scene()->is_editor_hint()) {
+	if (p_what==NOTIFICATION_DRAW && curve.is_valid() && is_inside_tree() && get_tree()->is_editor_hint()) {
 		//draw the curve!!
 
 		for(int i=0;i<curve->get_point_count();i++) {
@@ -52,7 +52,7 @@ void Path2D::_notification(int p_what) {
 void Path2D::_curve_changed() {
 
 
-	if (is_inside_scene() && get_scene()->is_editor_hint())
+	if (is_inside_tree() && get_tree()->is_editor_hint())
 		update();
 
 }
@@ -135,7 +135,7 @@ void PathFollow2D::_notification(int p_what) {
 
 	switch(p_what) {
 
-		case NOTIFICATION_ENTER_SCENE: {
+		case NOTIFICATION_ENTER_TREE: {
 
 			Node *parent=get_parent();
 			if (parent) {
@@ -147,7 +147,7 @@ void PathFollow2D::_notification(int p_what) {
 			}
 
 		} break;
-		case NOTIFICATION_EXIT_SCENE: {
+		case NOTIFICATION_EXIT_TREE: {
 
 
 			path=NULL;
diff --git a/scene/2d/physics_body_2d.cpp b/scene/2d/physics_body_2d.cpp
index 308aa8402f..f2f7a15e91 100644
--- a/scene/2d/physics_body_2d.cpp
+++ b/scene/2d/physics_body_2d.cpp
@@ -198,7 +198,7 @@ StaticBody2D::~StaticBody2D() {
 
 
 
-void RigidBody2D::_body_enter_scene(ObjectID p_id) {
+void RigidBody2D::_body_enter_tree(ObjectID p_id) {
 
 	Object *obj = ObjectDB::get_instance(p_id);
 	Node *node = obj ? obj->cast_to<Node>() : NULL;
@@ -218,7 +218,7 @@ void RigidBody2D::_body_enter_scene(ObjectID p_id) {
 
 }
 
-void RigidBody2D::_body_exit_scene(ObjectID p_id) {
+void RigidBody2D::_body_exit_tree(ObjectID p_id) {
 
 	Object *obj = ObjectDB::get_instance(p_id);
 	Node *node = obj ? obj->cast_to<Node>() : NULL;
@@ -251,10 +251,10 @@ void RigidBody2D::_body_inout(int p_status, ObjectID p_instance, int p_body_shap
 
 			E = contact_monitor->body_map.insert(objid,BodyState());
 //			E->get().rc=0;
-			E->get().in_scene=node && node->is_inside_scene();
+			E->get().in_scene=node && node->is_inside_tree();
 			if (node) {
-				node->connect(SceneStringNames::get_singleton()->enter_scene,this,SceneStringNames::get_singleton()->_body_enter_scene,make_binds(objid));
-				node->connect(SceneStringNames::get_singleton()->exit_scene,this,SceneStringNames::get_singleton()->_body_exit_scene,make_binds(objid));
+				node->connect(SceneStringNames::get_singleton()->enter_tree,this,SceneStringNames::get_singleton()->_body_enter_tree,make_binds(objid));
+				node->connect(SceneStringNames::get_singleton()->exit_tree,this,SceneStringNames::get_singleton()->_body_exit_tree,make_binds(objid));
 				if (E->get().in_scene) {
 					emit_signal(SceneStringNames::get_singleton()->body_enter,node);
 				}
@@ -283,8 +283,8 @@ void RigidBody2D::_body_inout(int p_status, ObjectID p_instance, int p_body_shap
 		if (E->get().shapes.empty()) {
 
 			if (node) {
-				node->disconnect(SceneStringNames::get_singleton()->enter_scene,this,SceneStringNames::get_singleton()->_body_enter_scene);
-				node->disconnect(SceneStringNames::get_singleton()->exit_scene,this,SceneStringNames::get_singleton()->_body_exit_scene);
+				node->disconnect(SceneStringNames::get_singleton()->enter_tree,this,SceneStringNames::get_singleton()->_body_enter_tree);
+				node->disconnect(SceneStringNames::get_singleton()->exit_tree,this,SceneStringNames::get_singleton()->_body_exit_tree);
 				if (in_scene)
 					emit_signal(SceneStringNames::get_singleton()->body_exit,obj);
 
@@ -694,8 +694,8 @@ void RigidBody2D::_bind_methods() {
 	ObjectTypeDB::bind_method(_MD("is_able_to_sleep"),&RigidBody2D::is_able_to_sleep);
 
 	ObjectTypeDB::bind_method(_MD("_direct_state_changed"),&RigidBody2D::_direct_state_changed);
-	ObjectTypeDB::bind_method(_MD("_body_enter_scene"),&RigidBody2D::_body_enter_scene);
-	ObjectTypeDB::bind_method(_MD("_body_exit_scene"),&RigidBody2D::_body_exit_scene);
+	ObjectTypeDB::bind_method(_MD("_body_enter_tree"),&RigidBody2D::_body_enter_tree);
+	ObjectTypeDB::bind_method(_MD("_body_exit_tree"),&RigidBody2D::_body_exit_tree);
 
 	BIND_VMETHOD(MethodInfo("_integrate_forces",PropertyInfo(Variant::OBJECT,"state:Physics2DDirectBodyState")));
 
@@ -803,7 +803,7 @@ Vector2 KinematicBody2D::move(const Vector2& p_motion) {
 
 
 	colliding=false;
-	ERR_FAIL_COND_V(!is_inside_scene(),Vector2());
+	ERR_FAIL_COND_V(!is_inside_tree(),Vector2());
 	Physics2DDirectSpaceState *dss = Physics2DServer::get_singleton()->space_get_direct_state(get_world_2d()->get_space());
 	ERR_FAIL_COND_V(!dss,Vector2());
 	const int max_shapes=32;
@@ -947,7 +947,7 @@ Vector2 KinematicBody2D::move_to(const Vector2& p_position) {
 
 bool KinematicBody2D::can_move_to(const Vector2& p_position, bool p_discrete) {
 
-	ERR_FAIL_COND_V(!is_inside_scene(),false);
+	ERR_FAIL_COND_V(!is_inside_tree(),false);
 	Physics2DDirectSpaceState *dss = Physics2DServer::get_singleton()->space_get_direct_state(get_world_2d()->get_space());
 	ERR_FAIL_COND_V(!dss,false);
 
@@ -987,7 +987,7 @@ bool KinematicBody2D::can_move_to(const Vector2& p_position, bool p_discrete) {
 
 bool KinematicBody2D::is_colliding() const {
 
-	ERR_FAIL_COND_V(!is_inside_scene(),false);
+	ERR_FAIL_COND_V(!is_inside_tree(),false);
 
 	return colliding;
 }
diff --git a/scene/2d/physics_body_2d.h b/scene/2d/physics_body_2d.h
index e429ca1432..77e909f105 100644
--- a/scene/2d/physics_body_2d.h
+++ b/scene/2d/physics_body_2d.h
@@ -170,8 +170,8 @@ private:
 
 
 	ContactMonitor *contact_monitor;
-	void _body_enter_scene(ObjectID p_id);
-	void _body_exit_scene(ObjectID p_id);
+	void _body_enter_tree(ObjectID p_id);
+	void _body_exit_tree(ObjectID p_id);
 
 
 	void _body_inout(int p_status, ObjectID p_instance, int p_body_shape,int p_local_shape);
diff --git a/scene/2d/position_2d.cpp b/scene/2d/position_2d.cpp
index ca3be9aa8f..2db2be123b 100644
--- a/scene/2d/position_2d.cpp
+++ b/scene/2d/position_2d.cpp
@@ -45,14 +45,14 @@ void Position2D::_notification(int p_what) {
 
 	switch(p_what) {
 
-		case NOTIFICATION_ENTER_SCENE: {
+		case NOTIFICATION_ENTER_TREE: {
 
 			update();
 		} break;
 		case NOTIFICATION_DRAW: {
-			if (!is_inside_scene())
+			if (!is_inside_tree())
 				break;
-			if (get_scene()->is_editor_hint())
+			if (get_tree()->is_editor_hint())
 				_draw_cross();
 
 		} break;
diff --git a/scene/2d/ray_cast_2d.cpp b/scene/2d/ray_cast_2d.cpp
index 8479338521..e352ac64f5 100644
--- a/scene/2d/ray_cast_2d.cpp
+++ b/scene/2d/ray_cast_2d.cpp
@@ -33,7 +33,7 @@
 void RayCast2D::set_cast_to(const Vector2& p_point) {
 
 	cast_to=p_point;
-	if (is_inside_scene() && get_scene()->is_editor_hint())
+	if (is_inside_tree() && get_tree()->is_editor_hint())
 		update();
 
 }
@@ -82,7 +82,7 @@ Vector2 RayCast2D::get_collision_normal() const{
 void RayCast2D::set_enabled(bool p_enabled) {
 
 	enabled=p_enabled;
-	if (is_inside_scene() && !get_scene()->is_editor_hint())
+	if (is_inside_tree() && !get_tree()->is_editor_hint())
 		set_fixed_process(p_enabled);
 	if (!p_enabled)
 		collided=false;
@@ -101,15 +101,15 @@ void RayCast2D::_notification(int p_what) {
 
 	switch(p_what) {
 
-		case NOTIFICATION_ENTER_SCENE: {
+		case NOTIFICATION_ENTER_TREE: {
 
-			if (enabled && !get_scene()->is_editor_hint())
+			if (enabled && !get_tree()->is_editor_hint())
 				set_fixed_process(true);
 			else
 				set_fixed_process(false);
 
 		} break;
-		case NOTIFICATION_EXIT_SCENE: {
+		case NOTIFICATION_EXIT_TREE: {
 
 			if (enabled)
 				set_fixed_process(false);
@@ -118,7 +118,7 @@ void RayCast2D::_notification(int p_what) {
 #ifdef TOOLS_ENABLED
 		case NOTIFICATION_DRAW: {
 
-			if (!get_scene()->is_editor_hint())
+			if (!get_tree()->is_editor_hint())
 				break;
 			Matrix32 xf;
 			xf.rotate(cast_to.atan2());
diff --git a/scene/2d/remote_transform_2d.cpp b/scene/2d/remote_transform_2d.cpp
index 80d038f6f8..b170986017 100644
--- a/scene/2d/remote_transform_2d.cpp
+++ b/scene/2d/remote_transform_2d.cpp
@@ -45,7 +45,7 @@ void RemoteTransform2D::_update_cache() {
 void RemoteTransform2D::_update_remote() {
 
 
-	if (!is_inside_scene())
+	if (!is_inside_tree())
 		return;
 
 	if (!cache)
@@ -59,7 +59,7 @@ void RemoteTransform2D::_update_remote() {
 	if (!n)
 		return;
 
-	if (!n->is_inside_scene())
+	if (!n->is_inside_tree())
 		return;
 
 					//todo make faster
@@ -77,7 +77,7 @@ void RemoteTransform2D::_notification(int p_what) {
 
 		} break;
 		case NOTIFICATION_TRANSFORM_CHANGED: {
-			if (!is_inside_scene())
+			if (!is_inside_tree())
 				break;
 
 			if (cache) {
@@ -95,7 +95,7 @@ void RemoteTransform2D::_notification(int p_what) {
 void RemoteTransform2D::set_remote_node(const NodePath& p_remote_node) {
 
 	remote_node=p_remote_node;
-	if (is_inside_scene())
+	if (is_inside_tree())
 		_update_cache();
 }
 
diff --git a/scene/2d/remote_transform_2d.h b/scene/2d/remote_transform_2d.h
index 9561e72255..05a9b20f6e 100644
--- a/scene/2d/remote_transform_2d.h
+++ b/scene/2d/remote_transform_2d.h
@@ -38,7 +38,7 @@ class RemoteTransform2D : public Node2D {
 
 	void _update_remote();
 	void _update_cache();
-	void _node_exited_scene();
+	//void _node_exited_scene();
 protected:
 
 	static void _bind_methods();
diff --git a/scene/2d/sample_player_2d.cpp b/scene/2d/sample_player_2d.cpp
index bc1734ec06..99dfa67c27 100644
--- a/scene/2d/sample_player_2d.cpp
+++ b/scene/2d/sample_player_2d.cpp
@@ -89,7 +89,7 @@ void SamplePlayer2D::_notification(int p_what) {
 
 	switch(p_what) {
 
-		case NOTIFICATION_ENTER_SCENE: {
+		case NOTIFICATION_ENTER_TREE: {
 
 			SpatialSound2DServer::get_singleton()->source_set_polyphony(get_source_rid(),polyphony);
 
diff --git a/scene/2d/screen_button.cpp b/scene/2d/screen_button.cpp
index b606634819..2ac3c06031 100644
--- a/scene/2d/screen_button.cpp
+++ b/scene/2d/screen_button.cpp
@@ -69,9 +69,9 @@ void TouchScreenButton::_notification(int p_what) {
 
 		case NOTIFICATION_DRAW: {
 
-			if (!is_inside_scene())
+			if (!is_inside_tree())
 				return;
-			if (!get_scene()->is_editor_hint() && !OS::get_singleton()->has_touchscreen_ui_hint() && visibility==VISIBILITY_TOUCHSCREEN_ONLY)
+			if (!get_tree()->is_editor_hint() && !OS::get_singleton()->has_touchscreen_ui_hint() && visibility==VISIBILITY_TOUCHSCREEN_ONLY)
 				return;
 
 			if (finger_pressed!=-1) {
@@ -87,13 +87,13 @@ void TouchScreenButton::_notification(int p_what) {
 			}
 
 		} break;
-		case NOTIFICATION_ENTER_SCENE: {
+		case NOTIFICATION_ENTER_TREE: {
 
-			if (!get_scene()->is_editor_hint() && !OS::get_singleton()->has_touchscreen_ui_hint() && visibility==VISIBILITY_TOUCHSCREEN_ONLY)
+			if (!get_tree()->is_editor_hint() && !OS::get_singleton()->has_touchscreen_ui_hint() && visibility==VISIBILITY_TOUCHSCREEN_ONLY)
 				return;
 			update();
 
-			if (!get_scene()->is_editor_hint())
+			if (!get_tree()->is_editor_hint())
 				set_process_input(true);
 
 			if (action.operator String()!="" && InputMap::get_singleton()->has_action(action)) {
@@ -129,7 +129,7 @@ String TouchScreenButton::get_action() const {
 
 void TouchScreenButton::_input(const InputEvent& p_event) {
 
-	if (!get_scene())
+	if (!get_tree())
 		return;
 
 	if (p_event.device != 0)
@@ -149,7 +149,7 @@ void TouchScreenButton::_input(const InputEvent& p_event) {
 				ie.ID=0;
 				ie.action.action=action_id;
 				ie.action.pressed=false;
-				get_scene()->input_event(ie);
+				get_tree()->input_event(ie);
 			}
 			finger_pressed=-1;
 
@@ -193,7 +193,7 @@ void TouchScreenButton::_input(const InputEvent& p_event) {
 							ie.ID=0;
 							ie.action.action=action_id;
 							ie.action.pressed=true;
-							get_scene()->input_event(ie);
+							get_tree()->input_event(ie);
 						}
 
 						update();
@@ -213,7 +213,7 @@ void TouchScreenButton::_input(const InputEvent& p_event) {
 							ie.ID=0;
 							ie.action.action=action_id;
 							ie.action.pressed=false;
-							get_scene()->input_event(ie);
+							get_tree()->input_event(ie);
 						}
 						finger_pressed=-1;
 
@@ -268,7 +268,7 @@ void TouchScreenButton::_input(const InputEvent& p_event) {
 						ie.ID=0;
 						ie.action.action=action_id;
 						ie.action.pressed=true;
-						get_scene()->input_event(ie);
+						get_tree()->input_event(ie);
 					}
 					update();
 
@@ -289,7 +289,7 @@ void TouchScreenButton::_input(const InputEvent& p_event) {
 						ie.ID=0;
 						ie.action.action=action_id;
 						ie.action.pressed=false;
-						get_scene()->input_event(ie);
+						get_tree()->input_event(ie);
 					}
 					finger_pressed=-1;
 					update();
diff --git a/scene/2d/sound_player_2d.cpp b/scene/2d/sound_player_2d.cpp
index 2fffef4e51..ef51295476 100644
--- a/scene/2d/sound_player_2d.cpp
+++ b/scene/2d/sound_player_2d.cpp
@@ -39,7 +39,7 @@ void SoundPlayer2D::_notification(int p_what) {
 
 	switch(p_what) {
 
-		case NOTIFICATION_ENTER_SCENE: {
+		case NOTIFICATION_ENTER_TREE: {
 			//find the sound space
 
 			source_rid = SpatialSound2DServer::get_singleton()->source_create(get_world_2d()->get_sound_space());
@@ -56,7 +56,7 @@ void SoundPlayer2D::_notification(int p_what) {
 			SpatialSound2DServer::get_singleton()->source_set_transform(source_rid,get_global_transform());
 
 		} break;
-		case NOTIFICATION_EXIT_SCENE: {
+		case NOTIFICATION_EXIT_TREE: {
 
 			if (source_rid.is_valid())
 				SpatialSound2DServer::get_singleton()->free(source_rid);
diff --git a/scene/2d/sprite.cpp b/scene/2d/sprite.cpp
index 8c3bbfdfc9..9f789a7a1f 100644
--- a/scene/2d/sprite.cpp
+++ b/scene/2d/sprite.cpp
@@ -365,7 +365,7 @@ void ViewportSprite::_notification(int p_what) {
 
 	switch(p_what) {
 
-		case NOTIFICATION_ENTER_SCENE: {
+		case NOTIFICATION_ENTER_TREE: {
 
 			if (!viewport_path.is_empty()) {
 
@@ -380,7 +380,7 @@ void ViewportSprite::_notification(int p_what) {
 				item_rect_changed();
 			}
 		} break;
-		case NOTIFICATION_EXIT_SCENE: {
+		case NOTIFICATION_EXIT_TREE: {
 
 			if (texture.is_valid()) {
 
@@ -422,7 +422,7 @@ void ViewportSprite::set_viewport_path(const NodePath& p_viewport) {
 
 	viewport_path=p_viewport;
 	update();
-	if (!is_inside_scene())
+	if (!is_inside_tree())
 		return;
 
 	if (texture.is_valid()) {
diff --git a/scene/2d/tile_map.cpp b/scene/2d/tile_map.cpp
index eb04ca924f..9fcf34cee6 100644
--- a/scene/2d/tile_map.cpp
+++ b/scene/2d/tile_map.cpp
@@ -33,7 +33,7 @@ void TileMap::_notification(int p_what) {
 
 	switch(p_what) {
 
-		case NOTIFICATION_ENTER_SCENE: {
+		case NOTIFICATION_ENTER_TREE: {
 
 			pending_update=true;
 			_update_dirty_quadrants();
@@ -43,7 +43,7 @@ void TileMap::_notification(int p_what) {
 
 
 		} break;
-		case NOTIFICATION_EXIT_SCENE: {
+		case NOTIFICATION_EXIT_TREE: {
 
 			_update_quadrant_space(RID());
 
@@ -68,7 +68,7 @@ void TileMap::_update_quadrant_space(const RID& p_space) {
 
 void TileMap::_update_quadrant_transform() {
 
-	if (!is_inside_scene())
+	if (!is_inside_tree())
 		return;
 
 	Matrix32 global_transform = get_global_transform();
@@ -164,7 +164,7 @@ void TileMap::_update_dirty_quadrants() {
 
 	if (!pending_update)
 		return;
-	if (!is_inside_scene())
+	if (!is_inside_tree())
 		return;
 	if (!tile_set.is_valid())
 		return;
@@ -345,7 +345,7 @@ Map<TileMap::PosKey,TileMap::Quadrant>::Element *TileMap::_create_quadrant(const
 	Physics2DServer::get_singleton()->body_set_param(q.static_body,Physics2DServer::BODY_PARAM_FRICTION,friction);
 	Physics2DServer::get_singleton()->body_set_param(q.static_body,Physics2DServer::BODY_PARAM_BOUNCE,bounce);
 
-	if (is_inside_scene()) {
+	if (is_inside_tree()) {
 		xform = get_global_transform() * xform;
 		RID space = get_world_2d()->get_space();
 		Physics2DServer::get_singleton()->body_set_space(q.static_body,space);
@@ -379,7 +379,7 @@ void TileMap::_make_quadrant_dirty(Map<PosKey,Quadrant>::Element *Q) {
 	if (pending_update)
 		return;
 	pending_update=true;
-	if (!is_inside_scene())
+	if (!is_inside_tree())
 		return;
 	call_deferred("_update_dirty_quadrants");
 }
diff --git a/scene/2d/visibility_notifier_2d.cpp b/scene/2d/visibility_notifier_2d.cpp
index e5eb193f6f..22534eeb0e 100644
--- a/scene/2d/visibility_notifier_2d.cpp
+++ b/scene/2d/visibility_notifier_2d.cpp
@@ -64,7 +64,7 @@ void VisibilityNotifier2D::_exit_viewport(Viewport* p_viewport){
 void VisibilityNotifier2D::set_rect(const Rect2& p_rect){
 
 	rect=p_rect;
-	if (is_inside_scene())
+	if (is_inside_tree())
 		get_world_2d()->_update_notifier(this,get_global_transform().xform(rect));
 
 	_change_notify("rect");
@@ -85,7 +85,7 @@ void VisibilityNotifier2D::_notification(int p_what) {
 
 
 	switch(p_what) {
-		case NOTIFICATION_ENTER_SCENE: {
+		case NOTIFICATION_ENTER_TREE: {
 
 			//get_world_2d()->
 			get_world_2d()->_register_notifier(this,get_global_transform().xform(rect));
@@ -97,12 +97,12 @@ void VisibilityNotifier2D::_notification(int p_what) {
 		} break;
 		case NOTIFICATION_DRAW: {
 
-			if (get_scene()->is_editor_hint()) {
+			if (get_tree()->is_editor_hint()) {
 
 				draw_rect(rect,Color(1,0.5,1,0.2));
 			}
 		} break;
-		case NOTIFICATION_EXIT_SCENE: {
+		case NOTIFICATION_EXIT_TREE: {
 
 			get_world_2d()->_remove_notifier(this);
 		} break;
@@ -190,7 +190,7 @@ void VisibilityEnabler2D::_find_nodes(Node* p_node) {
 
 	if (add) {
 
-		p_node->connect(SceneStringNames::get_singleton()->exit_scene,this,"_node_removed",varray(p_node),CONNECT_ONESHOT);
+		p_node->connect(SceneStringNames::get_singleton()->exit_tree,this,"_node_removed",varray(p_node),CONNECT_ONESHOT);
 		nodes[p_node]=meta;
 		_change_node_state(p_node,false);
 	}
@@ -207,9 +207,9 @@ void VisibilityEnabler2D::_find_nodes(Node* p_node) {
 
 void VisibilityEnabler2D::_notification(int p_what){
 
-	if (p_what==NOTIFICATION_ENTER_SCENE) {
+	if (p_what==NOTIFICATION_ENTER_TREE) {
 
-		if (get_scene()->is_editor_hint())
+		if (get_tree()->is_editor_hint())
 			return;
 
 
@@ -222,9 +222,9 @@ void VisibilityEnabler2D::_notification(int p_what){
 
 	}
 
-	if (p_what==NOTIFICATION_EXIT_SCENE) {
+	if (p_what==NOTIFICATION_EXIT_TREE) {
 
-		if (get_scene()->is_editor_hint())
+		if (get_tree()->is_editor_hint())
 			return;
 
 
@@ -235,7 +235,7 @@ void VisibilityEnabler2D::_notification(int p_what){
 
 			if (!visible)
 				_change_node_state(E->key(),true);
-			E->key()->disconnect(SceneStringNames::get_singleton()->exit_scene,this,"_node_removed");
+			E->key()->disconnect(SceneStringNames::get_singleton()->exit_tree,this,"_node_removed");
 		}
 
 		nodes.clear();