From 9e8e5ebdc74f535df395eaf5d8031002edfe5a10 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 --- 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 342c43802ef..ae569ea1894 100644 --- a/core/bind/core_bind.h +++ b/core/bind/core_bind.h @@ -581,9 +581,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 cee3f31d292..0bf11200090 100644 --- a/doc/classes/@GlobalScope.xml +++ b/doc/classes/@GlobalScope.xml @@ -53,7 +53,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 6707068c5a6..4250ffd7005 100644 --- a/doc/classes/Marshalls.xml +++ b/doc/classes/Marshalls.xml @@ -1,5 +1,5 @@ - + Data transformation (marshalling) and encoding helpers.