godotengine
/
godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix bug added in PR#17589. Resources couldn't be saved to files 

This PR fixes the code to avoid saving default environment every time
the project is run whitin the editor.

Should fix #17727. Sorry for the troubles!

(cherry picked from commit 7821b70a00)
This commit is contained in:
robfram 2018-03-24 19:16:47 +01:00 committed by Hein-Pieter van Braam
parent 7563c17113
commit 91525e3075
1 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
editor/editor_node.cpp
View File

@ -587,9 +587,6 @@ void EditorNode::open_resource(const String &p_type) {
void EditorNode::save_resource_in_path(const Ref<Resource> &p_resource, const String &p_path) { void EditorNode::save_resource_in_path(const Ref<Resource> &p_resource, const String &p_path) {
editor_data.apply_changes_in_editors(); editor_data.apply_changes_in_editors();
if (p_resource->get_last_modified_time() == p_resource->get_import_last_modified_time()) {
return;
}
int flg = 0; int flg = 0;
if (EditorSettings::get_singleton()->get("filesystem/on_save/compress_binary_resources")) if (EditorSettings::get_singleton()->get("filesystem/on_save/compress_binary_resources"))
@ -1435,7 +1432,8 @@ void EditorNode::_save_default_environment() {
if (fallback.is_valid() && fallback->get_path().is_resource_file()) { if (fallback.is_valid() && fallback->get_path().is_resource_file()) {
Map<RES, bool> processed; Map<RES, bool> processed;
_find_and_save_edited_subresources(fallback.ptr(), processed, 0); _find_and_save_edited_subresources(fallback.ptr(), processed, 0);
save_resource_in_path(fallback, fallback->get_path()); if (fallback->get_last_modified_time() != fallback->get_import_last_modified_time())
save_resource_in_path(fallback, fallback->get_path());
} }
} }