summaryrefslogtreecommitdiff
path: root/core/variant
diff options
context:
space:
mode:
authorRémi Verschelde <remi@verschelde.fr>2022-01-23 00:46:53 +0100
committerGitHub <noreply@github.com>2022-01-23 00:46:53 +0100
commit668d6a1c5ccface4f4ecc95ce4cf00cd5d90b1db (patch)
treece530b5da477c3aa727a7c0b4e3a686c17f2b655 /core/variant
parent5e26a275bbf38db357df6103768f42038f54cc71 (diff)
parente2ed9d13ebdf4fe2a7a7a4eacd47262310ffa3e3 (diff)
Merge pull request #56337 from cdemirer/fix-array-dictionary-id
Diffstat (limited to 'core/variant')
-rw-r--r--core/variant/array.cpp2
-rw-r--r--core/variant/dictionary.cpp2
2 files changed, 2 insertions, 2 deletions
diff --git a/core/variant/array.cpp b/core/variant/array.cpp
index 3d2f337442..1b39558dff 100644
--- a/core/variant/array.cpp
+++ b/core/variant/array.cpp
@@ -631,7 +631,7 @@ Variant Array::max() const {
}
const void *Array::id() const {
- return _p->array.ptr();
+ return _p;
}
Array::Array(const Array &p_from, uint32_t p_type, const StringName &p_class_name, const Variant &p_script) {
diff --git a/core/variant/dictionary.cpp b/core/variant/dictionary.cpp
index cc04ae712b..0f2f8fc8ed 100644
--- a/core/variant/dictionary.cpp
+++ b/core/variant/dictionary.cpp
@@ -350,7 +350,7 @@ void Dictionary::operator=(const Dictionary &p_dictionary) {
}
const void *Dictionary::id() const {
- return _p->variant_map.id();
+ return _p;
}
Dictionary::Dictionary(const Dictionary &p_from) {