diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2018-07-26 10:36:01 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-07-26 10:36:01 +0200 |
| commit | eab105310b6722684d48bc0fe944fccc9392a26d (patch) | |
| tree | 51f6acbb52ed245b2e0b7227f4c30ed4e9adbebd | |
| parent | 39168f125e7774129125721a99c0b9a4604ba2ab (diff) | |
| parent | 6bdec4ffb6a1e9f48052c257dfb647b1c16c0503 (diff) | |
Merge pull request #19257 from volzhs/edit-visual-script
Open internal visual script editor while use external editor is on
| -rw-r--r-- | editor/editor_node.cpp | 2 | ||||
| -rw-r--r-- | editor/plugins/script_editor_plugin.cpp | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/editor/editor_node.cpp b/editor/editor_node.cpp index 527ad0b72d..05fbf7aa76 100644 --- a/editor/editor_node.cpp +++ b/editor/editor_node.cpp @@ -1502,7 +1502,7 @@ void EditorNode::_edit_current() { if (main_plugin) { // special case if use of external editor is true - if (main_plugin->get_name() == "Script" && (bool(EditorSettings::get_singleton()->get("text_editor/external/use_external_editor")) || overrides_external_editor(current_obj))) { + if (main_plugin->get_name() == "Script" && current_obj->get_class_name() != StringName("VisualScript") && (bool(EditorSettings::get_singleton()->get("text_editor/external/use_external_editor")) || overrides_external_editor(current_obj))) { if (!changing_scene) main_plugin->edit(current_obj); } diff --git a/editor/plugins/script_editor_plugin.cpp b/editor/plugins/script_editor_plugin.cpp index 3f28cfd858..3b82e6578b 100644 --- a/editor/plugins/script_editor_plugin.cpp +++ b/editor/plugins/script_editor_plugin.cpp @@ -1876,6 +1876,7 @@ bool ScriptEditor::edit(const RES &p_resource, int p_line, int p_col, bool p_gra if ((debugger->get_dump_stack_script() != p_resource || debugger->get_debug_with_external_editor()) && p_resource->get_path().is_resource_file() && + p_resource->get_class_name() != StringName("VisualScript") && bool(EditorSettings::get_singleton()->get("text_editor/external/use_external_editor"))) { String path = EditorSettings::get_singleton()->get("text_editor/external/exec_path"); |