diff options
| author | Rémi Verschelde <remi@verschelde.fr> | 2022-02-09 09:46:02 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-02-09 09:46:02 +0100 |
| commit | 79077e6c10db9e8e53a8134f72e326f3ffb9c51c (patch) | |
| tree | f8e349d30bcd971780c19b988206e5fce85a8c63 /modules/gltf | |
| parent | 5e53d9d777a4087204dc142d21b878bfab265d63 (diff) | |
| parent | 90162851a79f46a0e8887e9a403b9ee4db333eb9 (diff) | |
Merge pull request #57817 from akien-mga/version-hash-cpp
Diffstat (limited to 'modules/gltf')
| -rw-r--r-- | modules/gltf/gltf_document.cpp | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/modules/gltf/gltf_document.cpp b/modules/gltf/gltf_document.cpp index baa39a3b80..0056fee7a4 100644 --- a/modules/gltf/gltf_document.cpp +++ b/modules/gltf/gltf_document.cpp @@ -57,7 +57,6 @@ #include "core/variant/typed_array.h" #include "core/variant/variant.h" #include "core/version.h" -#include "core/version_hash.gen.h" #include "drivers/png/png_driver_common.h" #include "editor/import/resource_importer_scene.h" #include "scene/2d/node_2d.h" @@ -6655,8 +6654,8 @@ Error GLTFDocument::_serialize_version(Ref<GLTFState> state) { Dictionary asset; asset["version"] = version; - String hash = VERSION_HASH; - asset["generator"] = String(VERSION_FULL_NAME) + String("@") + (hash.length() == 0 ? String("unknown") : hash); + String hash = String(VERSION_HASH); + asset["generator"] = String(VERSION_FULL_NAME) + String("@") + (hash.is_empty() ? String("unknown") : hash); state->json["asset"] = asset; ERR_FAIL_COND_V(!asset.has("version"), Error::FAILED); ERR_FAIL_COND_V(!state->json.has("asset"), Error::FAILED); |