diff options
| author | santiagopf | 2015-12-14 10:58:26 -0300 |
|---|---|---|
| committer | santiagopf | 2015-12-14 10:58:26 -0300 |
| commit | a9795d582665598decd4e73e1d879c83ce28a44b (patch) | |
| tree | 777a3da33fed3d6906704680e01bd87f97eba113 /modules/gdscript/gd_script.cpp | |
| parent | c8077de71475c174aa14fd045a2cddfc28de2468 (diff) | |
| parent | bfaa179e7088d9d6f4cf289e1915eec12c6b3b2a (diff) | |
| download | godot-a9795d582665598decd4e73e1d879c83ce28a44b.tar.gz godot-a9795d582665598decd4e73e1d879c83ce28a44b.tar.zst godot-a9795d582665598decd4e73e1d879c83ce28a44b.zip | |
Merge branch 'master' of https://github.com/godotengine/godot
Diffstat (limited to 'modules/gdscript/gd_script.cpp')
| -rw-r--r-- | modules/gdscript/gd_script.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/modules/gdscript/gd_script.cpp b/modules/gdscript/gd_script.cpp index c3cc779bc..62006cf18 100644 --- a/modules/gdscript/gd_script.cpp +++ b/modules/gdscript/gd_script.cpp @@ -1370,7 +1370,7 @@ Variant GDFunctionState::resume(const Variant& p_arg) { void GDFunctionState::_bind_methods() { - ObjectTypeDB::bind_method(_MD("resume:var","arg"),&GDFunctionState::resume,DEFVAL(Variant())); + ObjectTypeDB::bind_method(_MD("resume:Variant","arg"),&GDFunctionState::resume,DEFVAL(Variant())); ObjectTypeDB::bind_method(_MD("is_valid"),&GDFunctionState::is_valid); ObjectTypeDB::bind_native_method(METHOD_FLAGS_DEFAULT,"_signal_callback",&GDFunctionState::_signal_callback,MethodInfo("_signal_callback")); |