summaryrefslogtreecommitdiff
path: root/tools
diff options
context:
space:
mode:
authorRémi Verschelde <remi@verschelde.fr>2016-03-30 11:52:40 +0200
committerRémi Verschelde <remi@verschelde.fr>2016-03-30 11:52:40 +0200
commit44ee7c238e972b26c196f2c555da172b28ceecd1 (patch)
tree2c534b08a9f1d5ad38de9f4ee79e3db8dc44fa05 /tools
parent15d1fca0614ad87fd16fa7532e4db867b342d00e (diff)
parent9d74b76a69b1fda38d8e0fc5a7460c79ad276420 (diff)
Merge pull request #4149 from Paulb23/save_scene_flicker_issue_4118
Fix for issue #4118
Diffstat (limited to 'tools')
-rw-r--r--tools/editor/editor_node.cpp8
1 files changed, 6 insertions, 2 deletions
diff --git a/tools/editor/editor_node.cpp b/tools/editor/editor_node.cpp
index 02b0e9447a..6d033a5c25 100644
--- a/tools/editor/editor_node.cpp
+++ b/tools/editor/editor_node.cpp
@@ -2076,8 +2076,12 @@ void EditorNode::_menu_option_confirm(int p_option,bool p_confirmed) {
Node *scene = editor_data.get_edited_scene_root();
if (scene && scene->get_filename()!="") {
- //_save_scene(scene->get_filename());
- _save_scene_with_preview(scene->get_filename());
+ // save in background if in the script editor
+ if (_get_current_main_editor() == EDITOR_SCRIPT) {
+ _save_scene(scene->get_filename());
+ } else {
+ _save_scene_with_preview(scene->get_filename());
+ }
return;
};
// fallthrough to save_as