diff options
| author | Rémi Verschelde <remi@verschelde.fr> | 2021-06-14 18:43:54 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-06-14 18:43:54 +0200 |
| commit | f7fa5a0e3a3c75035afdff97afe2e5ee6121e4b7 (patch) | |
| tree | 5509b5458fc58cac1eb96cdd99b104e48374673a /modules/visual_script | |
| parent | 0610c559ec85f1ddd36a8ad2dc127e20ce2986b8 (diff) | |
| parent | 49ce5e69ee59cf59ecf2540aced420aada90520a (diff) | |
| download | redot-engine-f7fa5a0e3a3c75035afdff97afe2e5ee6121e4b7.tar.gz | |
Merge pull request #49600 from vnen/gdnative-api-generator-var-writer
GDNative: Use VariantWriter for the API JSON generator
Diffstat (limited to 'modules/visual_script')
| -rw-r--r-- | modules/visual_script/doc_classes/VisualScriptFunctionState.xml | 2 | ||||
| -rw-r--r-- | modules/visual_script/visual_script.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/modules/visual_script/doc_classes/VisualScriptFunctionState.xml b/modules/visual_script/doc_classes/VisualScriptFunctionState.xml index f5bf195bbf..9ed71bf10e 100644 --- a/modules/visual_script/doc_classes/VisualScriptFunctionState.xml +++ b/modules/visual_script/doc_classes/VisualScriptFunctionState.xml @@ -28,7 +28,7 @@ <method name="resume"> <return type="Variant"> </return> - <argument index="0" name="args" type="Array" default="null"> + <argument index="0" name="args" type="Array" default="[ ]"> </argument> <description> </description> diff --git a/modules/visual_script/visual_script.cpp b/modules/visual_script/visual_script.cpp index c9ed912ac1..7badb1b717 100644 --- a/modules/visual_script/visual_script.cpp +++ b/modules/visual_script/visual_script.cpp @@ -2204,7 +2204,7 @@ Variant VisualScriptFunctionState::resume(Array p_args) { void VisualScriptFunctionState::_bind_methods() { ClassDB::bind_method(D_METHOD("connect_to_signal", "obj", "signals", "args"), &VisualScriptFunctionState::connect_to_signal); - ClassDB::bind_method(D_METHOD("resume", "args"), &VisualScriptFunctionState::resume, DEFVAL(Variant())); + ClassDB::bind_method(D_METHOD("resume", "args"), &VisualScriptFunctionState::resume, DEFVAL(Array())); ClassDB::bind_method(D_METHOD("is_valid"), &VisualScriptFunctionState::is_valid); ClassDB::bind_vararg_method(METHOD_FLAGS_DEFAULT, "_signal_callback", &VisualScriptFunctionState::_signal_callback, MethodInfo("_signal_callback")); } |