diff options
| author | George Marques <george@gmarqu.es> | 2023-01-12 11:34:13 -0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-01-12 11:34:13 -0300 |
| commit | 75515e43034aab3acd014bf6c663c10fcba94900 (patch) | |
| tree | b7b87a41c77fafa85934d0e703830033ad926557 /modules/gdscript/gdscript_byte_codegen.cpp | |
| parent | 7319fa60825ec2e530fe843897b350e6012ae461 (diff) | |
| parent | a8c2f8a0e1c4d4e128bd64084f5e5611005a923d (diff) | |
| download | redot-engine-75515e43034aab3acd014bf6c663c10fcba94900.tar.gz | |
Merge pull request #70987 from vonagam/fix-parameter-conversion-assign
Diffstat (limited to 'modules/gdscript/gdscript_byte_codegen.cpp')
| -rw-r--r-- | modules/gdscript/gdscript_byte_codegen.cpp | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/modules/gdscript/gdscript_byte_codegen.cpp b/modules/gdscript/gdscript_byte_codegen.cpp index 57ee41e34e..6c80fb7665 100644 --- a/modules/gdscript/gdscript_byte_codegen.cpp +++ b/modules/gdscript/gdscript_byte_codegen.cpp @@ -872,8 +872,12 @@ void GDScriptByteCodeGenerator::write_assign_false(const Address &p_target) { append(p_target); } -void GDScriptByteCodeGenerator::write_assign_default_parameter(const Address &p_dst, const Address &p_src) { - write_assign(p_dst, p_src); +void GDScriptByteCodeGenerator::write_assign_default_parameter(const Address &p_dst, const Address &p_src, bool p_use_conversion) { + if (p_use_conversion) { + write_assign_with_conversion(p_dst, p_src); + } else { + write_assign(p_dst, p_src); + } function->default_arguments.push_back(opcodes.size()); } |