maxmustermann/godot
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Fixes scene corruption when updating dependencies.

Browse source 
This commit fixes issue #17585: renaming/moving resources can corrupt
scene files.  The corruption was caused by
'ResourceFormatLoaderBinary::rename_dependencies' updating the file
format version field of the affected scene file to the latest version
without actually updating the content of the file to that version,
resulting in a file whose content does not match its file format version
field.  The fix preserves the file format version field and the engine
version fields when renaming dependencies.
This commit is contained in:
Rainer Deyke 2018-03-19 16:37:57 +01:00
parent 6afaf83de3
commit 31c6d6649f
1 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
core/io/resource_format_binary.cpp
View file

@ -1162,9 +1162,11 @@ Error ResourceFormatLoaderBinary::rename_dependencies(const String &p_path, cons
ERR_FAIL_V(ERR_FILE_UNRECOGNIZED);
}
fw->store_32(VERSION_MAJOR); //current version
fw->store_32(VERSION_MINOR);
fw->store_32(FORMAT_VERSION);
// Since we're not actually converting the file contents, leave the version
// numbers in the file untouched.
fw->store_32(ver_major);
fw->store_32(ver_minor);
fw->store_32(ver_format);
save_ustring(fw, get_ustring(f)); //type