From 107e62be7045ae69415f8069a6f49ec912ec3799 Mon Sep 17 00:00:00 2001 From: Ignacio Etcheverry Date: Mon, 2 May 2016 13:40:44 +0200 Subject: Fix checking unsaved changes only in current scene --- tools/editor/editor_node.cpp | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'tools') diff --git a/tools/editor/editor_node.cpp b/tools/editor/editor_node.cpp index 09f85b99f6..f7608a6b9d 100644 --- a/tools/editor/editor_node.cpp +++ b/tools/editor/editor_node.cpp @@ -4668,7 +4668,11 @@ void EditorNode::_scene_tab_script_edited(int p_tab) { void EditorNode::_scene_tab_closed(int p_tab) { current_option = SCENE_TAB_CLOSE; tab_closing = p_tab; - if (unsaved_cache) { + + bool unsaved = (p_tab==editor_data.get_edited_scene()) ? + saved_version!=editor_data.get_undo_redo().get_version() : + editor_data.get_scene_version(p_tab)!=0; + if (unsaved) { confirmation->get_ok()->set_text("Yes"); //confirmation->get_cancel()->show(); confirmation->set_text("Close scene? (Unsaved changes will be lost)"); -- cgit v1.2.3 From 57d0b784266f02c8f021d09f4f0bab911d894207 Mon Sep 17 00:00:00 2001 From: "Daniel J. Ramirez" Date: Tue, 3 May 2016 01:45:54 -0500 Subject: Fixed documentation generator for polymorphic functions --- tools/doc/doc_data.cpp | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) (limited to 'tools') diff --git a/tools/doc/doc_data.cpp b/tools/doc/doc_data.cpp index 2d0d7617c2..4232a6480d 100644 --- a/tools/doc/doc_data.cpp +++ b/tools/doc/doc_data.cpp @@ -61,6 +61,26 @@ void DocData::merge_from(const DocData& p_data) { continue; if (cf.methods[j].arguments.size()!=m.arguments.size()) continue; + // since polymorphic functions are allowed we need to check the type of + // the arguments so we make sure they are different. + int arg_count = cf.methods[j].arguments.size(); + bool arg_used[arg_count]; + for (int l = 0; l < arg_count; ++l) arg_used[l] = false; + // also there is no guarantee that argument ordering will match, so we + // have to check one by one so we make sure we have an exact match + for (int k = 0; k < arg_count; ++k) { + for (int l = 0; l < arg_count; ++l) + if (cf.methods[j].arguments[k].type == m.arguments[l].type && !arg_used[l]) { + arg_used[l] = true; + break; + } + } + bool not_the_same = false; + for (int l = 0; l < arg_count; ++l) + if (!arg_used[l]) // at least one of the arguments was different + not_the_same = true; + if (not_the_same) + continue; const MethodDoc &mf = cf.methods[j]; -- cgit v1.2.3