diff options
| author | volzhs <volzhs@gmail.com> | 2018-05-30 07:37:03 +0900 |
|---|---|---|
| committer | volzhs <volzhs@gmail.com> | 2018-07-25 11:59:31 +0900 |
| commit | 6bdec4ffb6a1e9f48052c257dfb647b1c16c0503 (patch) | |
| tree | 76482d5530649780d0ff87f97a070cea07bc6f9b | |
| parent | f8e8ac2c664a12f3af2b9bb545da193d86c75503 (diff) | |
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 b366ebd911..fe6d317128 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 a1dc746702..863cd16b9d 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"); |