diff options
| author | Juan Linietsky <reduzio@gmail.com> | 2015-06-06 11:09:41 -0300 |
|---|---|---|
| committer | Juan Linietsky <reduzio@gmail.com> | 2015-06-06 11:09:41 -0300 |
| commit | 14c4c1b568ffa40a179332fbc77e9b52c6bdf514 (patch) | |
| tree | eff10eab1255b2e434b471d0609d6da02f8a400a /tools/editor/scene_tree_dock.cpp | |
| parent | 954256268afe89b648d356ee0b296a9e97a07373 (diff) | |
| parent | 697482328863b2790597df1efde0c3a0b4a9772e (diff) | |
Merge branch 'master' of https://github.com/okamstudio/godot
Diffstat (limited to 'tools/editor/scene_tree_dock.cpp')
| -rw-r--r-- | tools/editor/scene_tree_dock.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/tools/editor/scene_tree_dock.cpp b/tools/editor/scene_tree_dock.cpp index 87a13ee9ce..432f60fa53 100644 --- a/tools/editor/scene_tree_dock.cpp +++ b/tools/editor/scene_tree_dock.cpp @@ -171,7 +171,7 @@ void SceneTreeDock::_tool_selected(int p_tool, bool p_confirm_override) { if (!_validate_no_foreign()) break; - file->set_mode(FileDialog::MODE_OPEN_FILE); + file->set_mode(EditorFileDialog::MODE_OPEN_FILE); List<String> extensions; ResourceLoader::get_recognized_extensions_for_type("PackedScene",&extensions); file->clear_filters(); @@ -484,7 +484,7 @@ void SceneTreeDock::_notification(int p_what) { "MoveDown", "Duplicate", "Reparent", - "Del", + "Remove", }; for(int i=0;i<TOOL_BUTTON_MAX;i++) @@ -1355,7 +1355,7 @@ SceneTreeDock::SceneTreeDock(EditorNode *p_editor,Node *p_scene_root,EditorSelec accept = memnew( AcceptDialog ); add_child(accept); - file = memnew( FileDialog ); + file = memnew( EditorFileDialog ); add_child(file); file->connect("file_selected",this,"instance"); set_process_unhandled_key_input(true); |