diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2020-11-10 11:56:18 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-11-10 11:56:18 +0100 |
| commit | 263f7319240df6d57c779b1eb857c7f7ad6dfe47 (patch) | |
| tree | d80622288cfe365c0b53c899c49db65d8f9820de | |
| parent | 68067b8d97d1908ae05f5220b9b19acc6b6b3f01 (diff) | |
| parent | 74f98de223f0cc1ba5c6b7ccabaee78f12c01406 (diff) | |
Merge pull request #43434 from sneik15/patch-1
Updated gd_glue.cpp to work in the variant refactoring (Mono enabled)
| -rw-r--r-- | modules/mono/glue/gd_glue.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/modules/mono/glue/gd_glue.cpp b/modules/mono/glue/gd_glue.cpp index 4c1df529fc..58d8dceb25 100644 --- a/modules/mono/glue/gd_glue.cpp +++ b/modules/mono/glue/gd_glue.cpp @@ -55,7 +55,8 @@ MonoObject *godot_icall_GD_convert(MonoObject *p_what, int32_t p_type) { Variant what = GDMonoMarshal::mono_object_to_variant(p_what); const Variant *args[1] = { &what }; Callable::CallError ce; - Variant ret = Variant::construct(Variant::Type(p_type), args, 1, ce); + Variant ret; + Variant::construct(Variant::Type(p_type), ret, args, 1, ce); ERR_FAIL_COND_V(ce.error != Callable::CallError::CALL_OK, nullptr); return GDMonoMarshal::variant_to_mono_object(ret); } |