Browse Source

Open internal visual script editor while use external editor is on

volzhs 7 years ago
parent
commit
6bdec4ffb6
2 changed files with 2 additions and 1 deletions
  1. 1 1
      editor/editor_node.cpp
  2. 1 0
      editor/plugins/script_editor_plugin.cpp

+ 1 - 1
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);
 			}

+ 1 - 0
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");