godotengine/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-11-17 14:11:06 +00:00
Code Releases Wiki Activity

Bring that Whole New World to the Old Continent too

Browse Source 
Applies the clang-format style to the 2.1 branch as done for master in
5dbf1809c6.
This commit is contained in:
Rémi Verschelde
2017-03-19 00:36:26 +01:00
parent 1d418afe86
commit f8db8a3faa
1308 changed files with 147754 additions and 174357 deletions
Download Patch File Download Diff File Expand all files Collapse all files

56
editor/editor_reimport_dialog.cpp
View File

@@ -42,39 +42,36 @@ void EditorReImportDialog::popup_reimport() {
List<String> ril;
EditorFileSystem::get_singleton()->get_changed_sources(&ril);
scene_must_save=false;
scene_must_save = false;
TreeItem *root = tree->create_item();
for(List<String>::Element *E=ril.front();E;E=E->next()) {
for (List<String>::Element *E = ril.front(); E; E = E->next()) {
TreeItem *item = tree->create_item(root);
item->set_cell_mode(0,TreeItem::CELL_MODE_CHECK);
item->set_metadata(0,E->get());
item->set_text(0,E->get().replace_first("res://",""));
item->set_tooltip(0,E->get());
item->set_checked(0,true);
item->set_editable(0,true);
item->set_cell_mode(0, TreeItem::CELL_MODE_CHECK);
item->set_metadata(0, E->get());
item->set_text(0, E->get().replace_first("res://", ""));
item->set_tooltip(0, E->get());
item->set_checked(0, true);
item->set_editable(0, true);
items.push_back(item);
String name = E->get();
if (EditorFileSystem::get_singleton()->get_file_type(name)=="PackedScene" && EditorNode::get_singleton()->is_scene_in_use(name)) {
if (EditorFileSystem::get_singleton()->get_file_type(name) == "PackedScene" && EditorNode::get_singleton()->is_scene_in_use(name)) {
scene_must_save=true;
scene_must_save = true;
}
}
if (scene_must_save) {
if (EditorNode::get_singleton()->get_edited_scene() && EditorNode::get_singleton()->get_edited_scene()->get_filename()=="") {
if (EditorNode::get_singleton()->get_edited_scene() && EditorNode::get_singleton()->get_edited_scene()->get_filename() == "") {
error->set_text(TTR("Current scene must be saved to re-import."));
error->popup_centered_minsize();
get_ok()->set_text(TTR("Re-Import"));
get_ok()->set_disabled(true);
return;
}
get_ok()->set_disabled(false);
get_ok()->set_text(TTR("Save & Re-Import"));
@@ -83,12 +80,9 @@ void EditorReImportDialog::popup_reimport() {
get_ok()->set_disabled(false);
}
popup_centered(Size2(600,400));
popup_centered(Size2(600, 400));
}
void EditorReImportDialog::ok_pressed() {
if (EditorFileSystem::get_singleton()->is_scanning()) {
@@ -97,9 +91,7 @@ void EditorReImportDialog::ok_pressed() {
return;
}
EditorProgress ep("reimport",TTR("Re-Importing"),items.size());
EditorProgress ep("reimport", TTR("Re-Importing"), items.size());
String reload_fname;
if (scene_must_save && EditorNode::get_singleton()->get_edited_scene()) {
reload_fname = EditorNode::get_singleton()->get_edited_scene()->get_filename();
@@ -107,23 +99,22 @@ void EditorReImportDialog::ok_pressed() {
EditorNode::get_singleton()->clear_scene();
}
for(int i=0;i<items.size();i++) {
for (int i = 0; i < items.size(); i++) {
String it = items[i]->get_metadata(0);
ep.step(items[i]->get_text(0),i);
print_line("reload import from: "+it);
ep.step(items[i]->get_text(0), i);
print_line("reload import from: " + it);
Ref<ResourceImportMetadata> rimd = ResourceLoader::load_import_metadata(it);
ERR_CONTINUE(rimd.is_null());
String editor = rimd->get_editor();
Ref<EditorImportPlugin> eip = EditorImportExport::get_singleton()->get_import_plugin_by_name(editor);
ERR_CONTINUE(eip.is_null());
Error err = eip->import(it,rimd);
if (err!=OK) {
EditorNode::add_io_error("Error Importing:\n "+it);
Error err = eip->import(it, rimd);
if (err != OK) {
EditorNode::add_io_error("Error Importing:\n " + it);
}
}
if (reload_fname!="") {
if (reload_fname != "") {
EditorNode::get_singleton()->load_scene(reload_fname);
}
@@ -132,13 +123,12 @@ void EditorReImportDialog::ok_pressed() {
EditorReImportDialog::EditorReImportDialog() {
tree = memnew( Tree );
tree = memnew(Tree);
add_child(tree);
tree->set_hide_root(true);
set_child_rect(tree);
set_title(TTR("Re-Import Changed Resources"));
error = memnew( AcceptDialog);
error = memnew(AcceptDialog);
add_child(error);
scene_must_save=false;
scene_must_save = false;
}