From 0dbedd18fc62f700e92a4cf581e505d849bc47ad Mon Sep 17 00:00:00 2001
From: Juan Linietsky
Date: Wed, 5 Nov 2014 21:20:42 -0300
Subject: 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
---
 tools/editor/project_settings.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'tools/editor/project_settings.cpp')

diff --git a/tools/editor/project_settings.cpp b/tools/editor/project_settings.cpp
index 105f25146..304fb76d1 100644
--- a/tools/editor/project_settings.cpp
+++ b/tools/editor/project_settings.cpp
@@ -57,7 +57,7 @@ static const char* _button_names[JOY_BUTTON_MAX]={
 
 void ProjectSettings::_notification(int p_what) {
 
-	if (p_what==NOTIFICATION_ENTER_SCENE) {
+	if (p_what==NOTIFICATION_ENTER_TREE) {
 
 		translation_list->connect("button_pressed",this,"_translation_delete");
 		_update_actions();
@@ -504,7 +504,7 @@ void ProjectSettings::popup_project_settings() {
 void ProjectSettings::_item_selected() {
 
 
-	TreeItem *ti = globals_editor->get_tree()->get_selected();
+	TreeItem *ti = globals_editor->get_scene_tree()->get_selected();
 	if (!ti)
 		return;
 	if (!ti->get_parent())
@@ -1212,7 +1212,7 @@ ProjectSettings::ProjectSettings(EditorData *p_data) {
 	globals_editor->set_anchor_and_margin(MARGIN_LEFT,ANCHOR_BEGIN, 5 );
 	globals_editor->set_anchor_and_margin(MARGIN_RIGHT,ANCHOR_END, 5 );
 	globals_editor->set_capitalize_paths(false);
-	globals_editor->get_tree()->connect("cell_selected",this,"_item_selected");
+	globals_editor->get_scene_tree()->connect("cell_selected",this,"_item_selected");
 	globals_editor->connect("property_toggled",this,"_item_checked");
 	globals_editor->connect("property_edited",this,"_settings_prop_edited");
 
-- 
cgit v1.2.3-70-g09d2