godotengine/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-12-07 17:36:07 +00:00
Code Releases Wiki Activity

Merge pull request #15220 from ibrahn/variantcall-defargs-fix

Browse Source 
fix VariantCall default parameter ordering
This commit is contained in:
Rémi Verschelde
2018-01-03 12:50:04 +01:00
committed by GitHub
parent 5519481803 96706168d0
commit 6b6f60defc
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
core/variant_call.cpp
View File

@@ -101,9 +101,10 @@ struct _VariantCall {
const Variant *newargs[VARIANT_ARG_MAX];
for (int i = 0; i < p_argcount; i++)
newargs[i] = p_args[i];
int defargcount = def_argcount;
// fill in any remaining parameters with defaults
int first_default_arg = arg_count - def_argcount;
for (int i = p_argcount; i < arg_count; i++)
newargs[i] = &default_args[defargcount - (i - p_argcount) - 1]; //default arguments
newargs[i] = &default_args[i - first_default_arg];
#ifdef DEBUG_ENABLED
if (!verify_arguments(newargs, r_error))
return;