diff options
| author | Rémi Verschelde <remi@verschelde.fr> | 2021-10-15 17:35:21 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-10-15 17:35:21 +0200 |
| commit | 6fb06ec47ee720e99146b1fae171e4ae0463646e (patch) | |
| tree | 701430afcd8db0fb0877598c9740825e4cf355b4 | |
| parent | 4a0a91facf804207c477df4330d56d69d2a40d6f (diff) | |
| parent | 0be9664b42e38a62ffd5adcacf75eca449fbdf02 (diff) | |
Merge pull request #53581 from raulsntos/mono-marshal-generics
| -rw-r--r-- | modules/mono/mono_gd/gd_mono_marshal.cpp | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/modules/mono/mono_gd/gd_mono_marshal.cpp b/modules/mono/mono_gd/gd_mono_marshal.cpp index 11a31217d7..1247c80ebf 100644 --- a/modules/mono/mono_gd/gd_mono_marshal.cpp +++ b/modules/mono/mono_gd/gd_mono_marshal.cpp @@ -278,6 +278,12 @@ Variant::Type managed_to_variant_type(const ManagedType &p_type, bool *r_nil_is_ if (GDMonoUtils::Marshal::type_is_generic_icollection(reftype) || GDMonoUtils::Marshal::type_is_generic_ienumerable(reftype)) { return Variant::ARRAY; } + + // GodotObject + GDMonoClass *type_class = p_type.type_class; + if (CACHED_CLASS(GodotObject)->is_assignable_from(type_class)) { + return Variant::OBJECT; + } } break; default: { @@ -474,6 +480,11 @@ MonoObject *variant_to_mono_object_of_genericinst(const Variant &p_var, GDMonoCl return GDMonoUtils::create_managed_from(p_var.operator Array(), godot_array_class); } + // GodotObject + if (CACHED_CLASS(GodotObject)->is_assignable_from(p_type_class)) { + return GDMonoUtils::unmanaged_get_managed(p_var.operator Object *()); + } + ERR_FAIL_V_MSG(nullptr, "Attempted to convert Variant to unsupported generic type: '" + p_type_class->get_full_name() + "'."); } |