godotengine
/
godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Core: Change _Marshall class inherit from Reference to Object 

(cherry picked from commit 9e8e5ebdc7)
This commit is contained in:
Mateo Dev .59 2020-02-24 09:56:22 -03:00 committed by Rémi Verschelde
parent d001ca320d
commit e13324a889
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

@ -598,9 +598,9 @@ private:
bool _list_skip_hidden; bool _list_skip_hidden;
}; };
class _Marshalls : public Reference { class _Marshalls : public Object {
GDCLASS(_Marshalls, Reference); GDCLASS(_Marshalls, Object);
static _Marshalls *singleton; static _Marshalls *singleton;

2
doc/classes/@GlobalScope.xml
View File

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

2
doc/classes/Marshalls.xml
View File

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