diff options
| author | Juan Linietsky | 2014-11-05 21:20:42 -0300 |
|---|---|---|
| committer | Juan Linietsky | 2014-11-05 21:20:42 -0300 |
| commit | 0dbedd18fc62f700e92a4cf581e505d849bc47ad (patch) | |
| tree | 8f2c85b4d9227e441fd35ab4873009faa656bcba /tools/editor/project_settings.cpp | |
| parent | d14baf6e41bcdbe4968e0513beccc09dfb160ecd (diff) | |
| download | godot-0dbedd18fc62f700e92a4cf581e505d849bc47ad.tar.gz godot-0dbedd18fc62f700e92a4cf581e505d849bc47ad.tar.zst godot-0dbedd18fc62f700e92a4cf581e505d849bc47ad.zip | |
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
Diffstat (limited to 'tools/editor/project_settings.cpp')
| -rw-r--r-- | tools/editor/project_settings.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
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"); |