From 11b560d6d436a64a54daa5a5c8eb0a460dff7840 Mon Sep 17 00:00:00 2001 From: neikeq Date: Wed, 2 Dec 2015 10:59:17 +0100 Subject: [PATCH 1/2] Fix help view not scrolling to the top --- scene/gui/rich_text_label.cpp | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/scene/gui/rich_text_label.cpp b/scene/gui/rich_text_label.cpp index 3b0425b223a..d9a4d583b8f 100644 --- a/scene/gui/rich_text_label.cpp +++ b/scene/gui/rich_text_label.cpp @@ -1504,7 +1504,6 @@ Error RichTextLabel::append_bbcode(const String& p_bbcode) { void RichTextLabel::scroll_to_line(int p_line) { - p_line -= 1; ERR_FAIL_INDEX(p_line,lines.size()); _validate_line_caches(); vscroll->set_val(lines[p_line].height_accum_cache-lines[p_line].height_cache); @@ -1572,11 +1571,8 @@ bool RichTextLabel::search(const String& p_string,bool p_from_selection) { } - if (line > 1) { - line-=1; - } - - scroll_to_line(line); + line-=2; + scroll_to_line(line<0?0:line); return true; } From 868832bca73e8a77d451f20d9de8db06a3c3e90f Mon Sep 17 00:00:00 2001 From: Franklin Sobrinho Date: Thu, 3 Dec 2015 12:30:55 -0300 Subject: [PATCH 2/2] Fix editor crash after closing scene with certain types of nodes --- tools/editor/editor_node.cpp | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/tools/editor/editor_node.cpp b/tools/editor/editor_node.cpp index 7b96db56f21..c000a1346a3 100644 --- a/tools/editor/editor_node.cpp +++ b/tools/editor/editor_node.cpp @@ -1562,6 +1562,10 @@ void EditorNode::_edit_current() { scene_tree_dock->set_selected(NULL); property_editor->edit( NULL ); object_menu->set_disabled(true); + + if (editor_plugin_over) + editor_plugin_over->make_visible(false); + return; }