From e2ed9d13ebdf4fe2a7a7a4eacd47262310ffa3e3 Mon Sep 17 00:00:00 2001 From: cdemirer <41021322+cdemirer@users.noreply.github.com> Date: Thu, 30 Dec 2021 13:14:09 +0800 Subject: Fix Array and Dictionary id() and dictionary test bug --- core/variant/array.cpp | 2 +- core/variant/dictionary.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'core/variant') diff --git a/core/variant/array.cpp b/core/variant/array.cpp index 45f2e0c5ac..4f07dbf41f 100644 --- a/core/variant/array.cpp +++ b/core/variant/array.cpp @@ -627,7 +627,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 24d21386a7..a7f07b6a75 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) { -- cgit v1.2.3