diff options
author | Rémi Verschelde <remi@verschelde.fr> | 2015-11-25 00:25:55 +0100 |
---|---|---|
committer | Rémi Verschelde <remi@verschelde.fr> | 2015-11-25 00:25:55 +0100 |
commit | a1059e3e3e54e9921c0426c8a5c9faf595175cf0 (patch) | |
tree | 53f61fe581446a3affbc40f3def62e6107894b86 /tools/editor/plugins | |
parent | 5db398f67f695cd9b97d9ddefe9f80859ded4026 (diff) | |
parent | 06957a8026bd20869fe11958d2cd8539c270354f (diff) |
Merge pull request #2908 from neikeq/fix_editor_select
Fix bugs caused by merged Script and Help tabs
Diffstat (limited to 'tools/editor/plugins')
-rw-r--r-- | tools/editor/plugins/script_editor_plugin.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/tools/editor/plugins/script_editor_plugin.cpp b/tools/editor/plugins/script_editor_plugin.cpp index 1b66cde851..e01cf72149 100644 --- a/tools/editor/plugins/script_editor_plugin.cpp +++ b/tools/editor/plugins/script_editor_plugin.cpp @@ -1387,6 +1387,7 @@ void ScriptEditor::_notification(int p_what) { if (p_what==NOTIFICATION_READY) { get_tree()->connect("tree_changed",this,"_tree_changed"); + editor->connect("request_help",this,"_request_help"); } if (p_what==NOTIFICATION_EXIT_TREE) { @@ -2204,6 +2205,7 @@ void ScriptEditor::_bind_methods() { ObjectTypeDB::bind_method("_script_split_dragged",&ScriptEditor::_script_split_dragged); ObjectTypeDB::bind_method("_help_class_open",&ScriptEditor::_help_class_open); ObjectTypeDB::bind_method("_help_class_goto",&ScriptEditor::_help_class_goto); + ObjectTypeDB::bind_method("_request_help",&ScriptEditor::_help_class_open); ObjectTypeDB::bind_method("_history_forward",&ScriptEditor::_history_forward); ObjectTypeDB::bind_method("_history_back",&ScriptEditor::_history_back); } |