diff options
| author | Ricardo Pérez | 2015-05-05 22:27:05 +0200 |
|---|---|---|
| committer | Ricardo Pérez | 2015-05-05 22:27:05 +0200 |
| commit | 7bb53831d8aec2507f6341bd00deae29fde8e2c2 (patch) | |
| tree | bf6ce42c3dfee2707f7b8adff072297603b59a23 /core/io/resource_format_xml.cpp | |
| parent | af068439829a3fec3a76c4c5d4dd2dba71ab6c5f (diff) | |
| parent | bc3c14a76b988a50e65328a932316c2e630a7ae6 (diff) | |
| download | godot-7bb53831d8aec2507f6341bd00deae29fde8e2c2.tar.gz godot-7bb53831d8aec2507f6341bd00deae29fde8e2c2.tar.zst godot-7bb53831d8aec2507f6341bd00deae29fde8e2c2.zip | |
Merge pull request #6 from okamstudio/master
Sync
Diffstat (limited to 'core/io/resource_format_xml.cpp')
| -rw-r--r-- | core/io/resource_format_xml.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/core/io/resource_format_xml.cpp b/core/io/resource_format_xml.cpp index 5922d8390..9de33e7ef 100644 --- a/core/io/resource_format_xml.cpp +++ b/core/io/resource_format_xml.cpp @@ -309,6 +309,7 @@ Error ResourceInteractiveLoaderXML::_parse_array_element(Vector<char> &buff,bool buff_max++; buff.resize(buff_max); + buffptr=buff.ptr(); } @@ -2563,7 +2564,7 @@ Error ResourceFormatSaverXMLInstance::save(const String &p_path,const RES& p_res List<PropertyInfo> property_list; res->get_property_list(&property_list); - property_list.sort(); +// property_list.sort(); for(List<PropertyInfo>::Element *PE = property_list.front();PE;PE=PE->next()) { |