diff options
| author | Juan Linietsky <reduzio@gmail.com> | 2016-05-21 22:34:55 -0300 |
|---|---|---|
| committer | Juan Linietsky <reduzio@gmail.com> | 2016-05-21 22:34:55 -0300 |
| commit | eacb8f04c4697b8123afeec03088eebb3c4b20bd (patch) | |
| tree | 8070f7807ec5d6a375df7184b151abbee8790608 /tools/editor/import_settings.cpp | |
| parent | a75f8963380a1f6ae8501f21a1d3f3bef8a89d91 (diff) | |
| parent | 4c4d79e3c98182faf348f41f98d1cc3e5d843e69 (diff) | |
Merge remote-tracking branch 'origin/master'
Diffstat (limited to 'tools/editor/import_settings.cpp')
| -rw-r--r-- | tools/editor/import_settings.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tools/editor/import_settings.cpp b/tools/editor/import_settings.cpp index 3b3ebb0ad7..dfaeca03db 100644 --- a/tools/editor/import_settings.cpp +++ b/tools/editor/import_settings.cpp @@ -278,7 +278,7 @@ ImportSettingsDialog::ImportSettingsDialog(EditorNode *p_editor) { set_child_rect(tree); set_title(TTR("Imported Resources")); - texformat=TTR("Keep,None,Disk,VRAM"); +// texformat="Keep,None,Disk,VRAM"; tree->set_hide_root(true); tree->set_columns(2); @@ -288,7 +288,7 @@ ImportSettingsDialog::ImportSettingsDialog(EditorNode *p_editor) { tree->connect("item_edited",this,"_item_edited"); tree->connect("button_pressed",this,"_button_pressed"); -// add_button(TTR("Re-Import"),"reimport"); +// add_button("Re-Import","reimport"); get_ok()->set_text(TTR("Re-Import")); get_cancel()->set_text(TTR("Close")); |