diff options
| author | George Marques | 2016-11-06 13:34:18 -0200 |
|---|---|---|
| committer | GitHub | 2016-11-06 13:34:18 -0200 |
| commit | 88b00cb6581832a1899ceaf6de9db0c51971099b (patch) | |
| tree | ae542818bca2db822d0f2e1f24e479091bda26c5 /core/bind/core_bind.cpp | |
| parent | a4570cb4615f5bbbf0091b3832101179d5e1662a (diff) | |
| parent | 6d6d9bc7f98591b1398491f759cd0ec9ae2cab12 (diff) | |
| download | godot-88b00cb6581832a1899ceaf6de9db0c51971099b.tar.gz godot-88b00cb6581832a1899ceaf6de9db0c51971099b.tar.zst godot-88b00cb6581832a1899ceaf6de9db0c51971099b.zip | |
Merge pull request #7048 from neikeq/pr-marshals-singleton
Add singleton instance to _Marshalls
Diffstat (limited to '')
| -rw-r--r-- | core/bind/core_bind.cpp | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/core/bind/core_bind.cpp b/core/bind/core_bind.cpp index 4e815d044..b947eec8d 100644 --- a/core/bind/core_bind.cpp +++ b/core/bind/core_bind.cpp @@ -2043,6 +2043,13 @@ _Directory::~_Directory() { memdelete(d); } +_Marshalls* _Marshalls::singleton=NULL; + +_Marshalls *_Marshalls::get_singleton() +{ + return singleton; +} + String _Marshalls::variant_to_base64(const Variant& p_var) { int len; |