northern-lighthouse/godot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

restored binary compatibility, which was broken in #14406

Browse Source
This commit is contained in:
Juan Linietsky
2017-12-16 15:48:16 -03:00
parent 1e2a8132f3
commit c93cb30cbb
2 changed files with 11 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
scene/resources/packed_scene.cpp
View File

@ -1117,9 +1117,11 @@ void SceneState::set_bundled_scene(const Dictionary &p_dictionary) {
nd.parent = r[idx++]; nd.parent = r[idx++];
nd.owner = r[idx++]; nd.owner = r[idx++];
nd.type = r[idx++]; nd.type = r[idx++];
nd.name = r[idx++]; uint32_t name_index = r[idx++];
nd.name = name_index & ((1 << NAME_INDEX_BITS) - 1);
nd.index = (name_index >> NAME_INDEX_BITS);
nd.index--; //0 is invaild, stored as 1
nd.instance = r[idx++]; nd.instance = r[idx++];
nd.index = r[idx++];
nd.properties.resize(r[idx++]); nd.properties.resize(r[idx++]);
for (int j = 0; j < nd.properties.size(); j++) { for (int j = 0; j < nd.properties.size(); j++) {
@ -1210,9 +1212,12 @@ Dictionary SceneState::get_bundled_scene() const {
rnodes.push_back(nd.parent); rnodes.push_back(nd.parent);
rnodes.push_back(nd.owner); rnodes.push_back(nd.owner);
rnodes.push_back(nd.type); rnodes.push_back(nd.type);
rnodes.push_back(nd.name); uint32_t name_index = nd.name;
if (nd.index < (1 << (32 - NAME_INDEX_BITS))) { //save if less than 16k childs
name_index |= uint32_t(nd.index + 1) << NAME_INDEX_BITS; //for backwards compatibility, index 0 is no index
}
rnodes.push_back(name_index);
rnodes.push_back(nd.instance); rnodes.push_back(nd.instance);
rnodes.push_back(nd.index);
rnodes.push_back(nd.properties.size()); rnodes.push_back(nd.properties.size());
for (int j = 0; j < nd.properties.size(); j++) { for (int j = 0; j < nd.properties.size(); j++) {

2
scene/resources/packed_scene.h
View File

@ -48,6 +48,8 @@ class SceneState : public Reference {
enum { enum {
NO_PARENT_SAVED = 0x7FFFFFFF, NO_PARENT_SAVED = 0x7FFFFFFF,
NAME_INDEX_BITS = 18,
NAME_MASK = (1 << NAME_INDEX_BITS) - 1,
}; };
struct NodeData { struct NodeData {