From dd57c321bf941638524f463e6d14752e1cb1cd5a 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: [PATCH] Fix Array and Dictionary id() and dictionary test bug (cherry picked from commit e2ed9d13ebdf4fe2a7a7a4eacd47262310ffa3e3) --- core/array.cpp | 2 +- core/dictionary.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/core/array.cpp b/core/array.cpp index 28f7e75c5cf..f6372bd2a90 100644 --- a/core/array.cpp +++ b/core/array.cpp @@ -474,7 +474,7 @@ Variant Array::max() const { } const void *Array::id() const { - return _p->array.ptr(); + return _p; } Array::Array(const Array &p_from) { diff --git a/core/dictionary.cpp b/core/dictionary.cpp index 400bbfc9a83..1402980b0ea 100644 --- a/core/dictionary.cpp +++ b/core/dictionary.cpp @@ -280,7 +280,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) {