diff options
author | RĂ©mi Verschelde <rverschelde@gmail.com> | 2020-02-24 14:58:18 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-02-24 14:58:18 +0100 |
commit | 5e181ac9f1fb83df6a933865753e54b534ac1048 (patch) | |
tree | d1bb268dd3a1d63e0ebbd770e8f4f05544285c97 /core/bind | |
parent | 9e4d11d10d3763d0ed2de156a5a4d52566157b2f (diff) | |
parent | 9e8e5ebdc74f535df395eaf5d8031002edfe5a10 (diff) |
Merge pull request #36506 from kuruk-mm/marshall_to_object
Core: Change _Marshall class from inherit Reference to Object
Diffstat (limited to 'core/bind')
-rw-r--r-- | core/bind/core_bind.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/core/bind/core_bind.h b/core/bind/core_bind.h index 342c43802e..ae569ea189 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; |