diff options
| author | Rémi Verschelde <remi@verschelde.fr> | 2022-06-06 23:38:29 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-06-06 23:38:29 +0200 |
| commit | 83421cd06f8aeacc69d666e0e695333fdaa80377 (patch) | |
| tree | 58a9c005ef6f029f8884120a4f1b6dee5bb9b008 /core/variant/variant_call.cpp | |
| parent | 8fb004efbc6161d2adec9501c08cfc9a910086f6 (diff) | |
| parent | a0915e6dee4e54563a98ca6adb8968dbdcea1af1 (diff) | |
| download | redot-engine-83421cd06f8aeacc69d666e0e695333fdaa80377.tar.gz | |
Merge pull request #59883 from KoBeWi/merge_this
Diffstat (limited to 'core/variant/variant_call.cpp')
| -rw-r--r-- | core/variant/variant_call.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/core/variant/variant_call.cpp b/core/variant/variant_call.cpp index 6b1868df68..3fe5ead347 100644 --- a/core/variant/variant_call.cpp +++ b/core/variant/variant_call.cpp @@ -1813,6 +1813,7 @@ static void _register_variant_builtin_methods() { bind_method(Dictionary, size, sarray(), varray()); bind_method(Dictionary, is_empty, sarray(), varray()); bind_method(Dictionary, clear, sarray(), varray()); + bind_method(Dictionary, merge, sarray("dictionary", "overwrite"), varray(false)); bind_method(Dictionary, has, sarray("key"), varray()); bind_method(Dictionary, has_all, sarray("keys"), varray()); bind_method(Dictionary, erase, sarray("key"), varray()); |