diff options
| author | Juan Linietsky <reduzio@gmail.com> | 2016-08-25 17:45:20 -0300 |
|---|---|---|
| committer | Juan Linietsky <reduzio@gmail.com> | 2016-08-25 17:45:20 -0300 |
| commit | 9c6175db11ff72603ae58789a462b33ec1e910f8 (patch) | |
| tree | c7fbb26583b6c7f44b9f8091aa59497900527f08 /tools/editor/editor_node.cpp | |
| parent | 41a58f7935ecd0c91ae55a5e5b84425aadc51840 (diff) | |
| download | redot-engine-9c6175db11ff72603ae58789a462b33ec1e910f8.tar.gz | |
More visual script work
-Block switches to 2d/3d editor if editing visual script
-Added cast node in flow control
-Added ability to do RPC in visual script
-Comment nodes
-Fix bug with inverted cable in connecting backwards
-Copy and paste nodes, including from different scripts
Diffstat (limited to 'tools/editor/editor_node.cpp')
| -rw-r--r-- | tools/editor/editor_node.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/editor/editor_node.cpp b/tools/editor/editor_node.cpp index 85c560bf9d..ea553c5597 100644 --- a/tools/editor/editor_node.cpp +++ b/tools/editor/editor_node.cpp @@ -1673,7 +1673,7 @@ void EditorNode::_edit_current() { if (main_plugin) { - if (main_plugin!=editor_plugin_screen) { + if (main_plugin!=editor_plugin_screen && (!ScriptEditor::get_singleton() || !ScriptEditor::get_singleton()->is_visible() || ScriptEditor::get_singleton()->can_take_away_focus())) { // update screen main_plugin |