Nixyri/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-01-06 02:00:57 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Merge pull request #36506 from kuruk-mm/marshall_to_object

Browse Source 
Core: Change _Marshall class from inherit Reference to Object
This commit is contained in:
Rémi Verschelde 2020-02-24 14:58:18 +01:00 committed by GitHub
commit 5e181ac9f1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
core/bind/core_bind.h
View File

@ -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;

2
doc/classes/@GlobalScope.xml
View File

@ -53,7 +53,7 @@
The [JavaScript] singleton.
[b]Note:[/b] Only implemented on HTML5.
</member>
<member name="Marshalls" type="Reference" setter="" getter="">
<member name="Marshalls" type="Marshalls" setter="" getter="">
The [Marshalls] singleton.
</member>
<member name="Navigation2DServer" type="Navigation2DServer" setter="" getter="">

2
doc/classes/Marshalls.xml
View File

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8" ?>
<class name="Marshalls" inherits="Reference" version="4.0">
<class name="Marshalls" inherits="Object" version="4.0">
<brief_description>
Data transformation (marshalling) and encoding helpers.
</brief_description>