From 534c8e74b9e4990ac1f63ef701330552cecfc28f Mon Sep 17 00:00:00 2001
From: Juan Linietsky <reduzio@gmail.com>
Date: Mon, 14 Dec 2015 08:21:18 -0300
Subject: do not open dominant script if external editor is selected, fixes
#3067
---
tools/editor/plugins/script_editor_plugin.cpp | 3 +++
1 file changed, 3 insertions(+)
(limited to 'tools/editor/plugins/script_editor_plugin.cpp')
diff --git a/tools/editor/plugins/script_editor_plugin.cpp b/tools/editor/plugins/script_editor_plugin.cpp
index df6397ed1d..b95c837003 100644
--- a/tools/editor/plugins/script_editor_plugin.cpp
+++ b/tools/editor/plugins/script_editor_plugin.cpp
@@ -2256,6 +2256,9 @@ void ScriptEditor::_history_back(){
void ScriptEditor::set_scene_root_script( Ref<Script> p_script ) {
bool open_dominant = EditorSettings::get_singleton()->get("text_editor/open_dominant_script_on_scene_change");
+ if (bool(EditorSettings::get_singleton()->get("external_editor/use_external_editor")))
+ return;
+
if (open_dominant && p_script.is_valid()) {
edit(p_script);
}
--
cgit v1.2.3
From f2183a5e09cc55a91b550f0d8f45b45a93d82b29 Mon Sep 17 00:00:00 2001
From: Juan Linietsky <reduzio@gmail.com>
Date: Mon, 14 Dec 2015 08:28:01 -0300
Subject: replaced :var by :Variant in documentation, fixes #2897
---
tools/editor/plugins/script_editor_plugin.cpp | 1 +
1 file changed, 1 insertion(+)
(limited to 'tools/editor/plugins/script_editor_plugin.cpp')
diff --git a/tools/editor/plugins/script_editor_plugin.cpp b/tools/editor/plugins/script_editor_plugin.cpp
index b95c837003..178871ea75 100644
--- a/tools/editor/plugins/script_editor_plugin.cpp
+++ b/tools/editor/plugins/script_editor_plugin.cpp
@@ -2256,6 +2256,7 @@ void ScriptEditor::_history_back(){
void ScriptEditor::set_scene_root_script( Ref<Script> p_script ) {
bool open_dominant = EditorSettings::get_singleton()->get("text_editor/open_dominant_script_on_scene_change");
+
if (bool(EditorSettings::get_singleton()->get("external_editor/use_external_editor")))
return;
--
cgit v1.2.3