diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2020-01-06 14:04:55 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-01-06 14:04:55 +0100 |
| commit | 8aea5decc6f328d0fc6eeebdc076d20130bf5794 (patch) | |
| tree | 55774a08e1b8a15f95ebb3ac0ce4fee8af480342 /scene/resources/packed_scene.cpp | |
| parent | e62941fb5317cffd8f4173da287fd204ee8131e0 (diff) | |
| parent | dc61323b2ce5478b1fc07581e64f7b7fcfdaf239 (diff) | |
Merge pull request #34020 from gytsen/unify-pack-version
PCK: Set VERSION_PATCH in header, factor out header magic
Diffstat (limited to 'scene/resources/packed_scene.cpp')
| -rw-r--r-- | scene/resources/packed_scene.cpp | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/scene/resources/packed_scene.cpp b/scene/resources/packed_scene.cpp index 14e024a496..978d81d5c2 100644 --- a/scene/resources/packed_scene.cpp +++ b/scene/resources/packed_scene.cpp @@ -39,7 +39,7 @@ #include "scene/gui/control.h" #include "scene/main/instance_placeholder.h" -#define PACK_VERSION 2 +#define PACKED_SCENE_VERSION 2 bool SceneState::can_instance() const { @@ -1095,7 +1095,7 @@ void SceneState::set_bundled_scene(const Dictionary &p_dictionary) { if (p_dictionary.has("version")) version = p_dictionary["version"]; - ERR_FAIL_COND_MSG(version > PACK_VERSION, "Save format version too new."); + ERR_FAIL_COND_MSG(version > PACKED_SCENE_VERSION, "Save format version too new."); const int node_count = p_dictionary["node_count"]; const PoolVector<int> snodes = p_dictionary["nodes"]; @@ -1285,9 +1285,7 @@ Dictionary SceneState::get_bundled_scene() const { d["base_scene"] = base_scene_idx; } - d["version"] = PACK_VERSION; - - //d["path"]=path; + d["version"] = PACKED_SCENE_VERSION; return d; } |