Ignore external editor for built-in scripts
(cherry picked from commit 9abb07efb4
)
This commit is contained in:
parent
d250d910bc
commit
969136e675
2 changed files with 6 additions and 3 deletions
|
@ -2108,7 +2108,8 @@ void EditorNode::_edit_current() {
|
|||
|
||||
if (main_plugin) {
|
||||
// special case if use of external editor is true
|
||||
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))) {
|
||||
Resource *res = Object::cast_to<Resource>(current_obj);
|
||||
if (main_plugin->get_name() == "Script" && current_obj->get_class_name() != StringName("VisualScript") && res && !res->get_path().empty() && res->get_path().find("::") == -1 && (bool(EditorSettings::get_singleton()->get("text_editor/external/use_external_editor")) || overrides_external_editor(current_obj))) {
|
||||
if (!changing_scene) {
|
||||
main_plugin->edit(current_obj);
|
||||
}
|
||||
|
|
|
@ -1969,9 +1969,10 @@ bool ScriptEditor::edit(const RES &p_resource, int p_line, int p_col, bool p_gra
|
|||
Ref<Script> script = p_resource;
|
||||
|
||||
// Don't open dominant script if using an external editor.
|
||||
const bool use_external_editor =
|
||||
bool use_external_editor =
|
||||
EditorSettings::get_singleton()->get("text_editor/external/use_external_editor") ||
|
||||
(script.is_valid() && script->get_language()->overrides_external_editor());
|
||||
use_external_editor = use_external_editor && !(script.is_valid() && (script->get_path().empty() || script->get_path().find("::") != -1)); // Ignore external editor for built-in scripts.
|
||||
const bool open_dominant = EditorSettings::get_singleton()->get("text_editor/files/open_dominant_script_on_scene_change");
|
||||
|
||||
const bool should_open = (open_dominant && !use_external_editor) || !EditorNode::get_singleton()->is_changing_scene();
|
||||
|
@ -2920,9 +2921,10 @@ Vector<Ref<Script>> ScriptEditor::get_open_scripts() const {
|
|||
|
||||
void ScriptEditor::set_scene_root_script(Ref<Script> p_script) {
|
||||
// Don't open dominant script if using an external editor.
|
||||
const bool use_external_editor =
|
||||
bool use_external_editor =
|
||||
EditorSettings::get_singleton()->get("text_editor/external/use_external_editor") ||
|
||||
(p_script.is_valid() && p_script->get_language()->overrides_external_editor());
|
||||
use_external_editor = use_external_editor && !(p_script.is_valid() && (p_script->get_path().empty() || p_script->get_path().find("::") != -1)); // Ignore external editor for built-in scripts.
|
||||
const bool open_dominant = EditorSettings::get_singleton()->get("text_editor/files/open_dominant_script_on_scene_change");
|
||||
|
||||
if (open_dominant && !use_external_editor && p_script.is_valid()) {
|
||||
|
|
Loading…
Reference in a new issue