From e13324a889431f70b2858b08bfecf7a82652e965 Mon Sep 17 00:00:00 2001 From: "Mateo Dev .59" Date: Mon, 24 Feb 2020 09:56:22 -0300 Subject: [PATCH] Core: Change _Marshall class inherit from Reference to Object (cherry picked from commit 9e8e5ebdc74f535df395eaf5d8031002edfe5a10) --- core/bind/core_bind.h | 4 ++-- doc/classes/@GlobalScope.xml | 2 +- doc/classes/Marshalls.xml | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/core/bind/core_bind.h b/core/bind/core_bind.h index 87da51f97ed..06468c342d6 100644 --- a/core/bind/core_bind.h +++ b/core/bind/core_bind.h @@ -598,9 +598,9 @@ private: bool _list_skip_hidden; }; -class _Marshalls : public Reference { +class _Marshalls : public Object { - GDCLASS(_Marshalls, Reference); + GDCLASS(_Marshalls, Object); static _Marshalls *singleton; diff --git a/doc/classes/@GlobalScope.xml b/doc/classes/@GlobalScope.xml index e346a312cb6..11c1c57a436 100644 --- a/doc/classes/@GlobalScope.xml +++ b/doc/classes/@GlobalScope.xml @@ -50,7 +50,7 @@ The [JavaScript] singleton. [b]Note:[/b] Only implemented on HTML5. - + The [Marshalls] singleton. diff --git a/doc/classes/Marshalls.xml b/doc/classes/Marshalls.xml index a5770afacc3..f0de3afc41f 100644 --- a/doc/classes/Marshalls.xml +++ b/doc/classes/Marshalls.xml @@ -1,5 +1,5 @@ - + Data transformation (marshalling) and encoding helpers.