Răsfoiți Sursa

Merge pull request #36506 from kuruk-mm/marshall_to_object

Core: Change _Marshall class from inherit Reference to Object
Rémi Verschelde 5 ani în urmă
părinte
comite
5e181ac9f1
3 a modificat fișierele cu 4 adăugiri și 4 ștergeri
  1. 2 2
      core/bind/core_bind.h
  2. 1 1
      doc/classes/@GlobalScope.xml
  3. 1 1
      doc/classes/Marshalls.xml

+ 2 - 2
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;
 

+ 1 - 1
doc/classes/@GlobalScope.xml

@@ -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="">

+ 1 - 1
doc/classes/Marshalls.xml

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